diff options
| author | Marius Kintel <marius@kintel.net> | 2013-12-09 05:48:26 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-12-09 05:48:26 (GMT) |
| commit | 7e0917d6b22fe8225fff7c66d352145d669a4a5d (patch) | |
| tree | 10923429ee676f33cc5dd7438500c4a81676fe78 /tests/CTestCustom.template | |
| parent | 3bd224b990f6d6b4c51072bf0c3ae895fbfe707e (diff) | |
| parent | e96305ddf5a728eb323a86e4e900752ae2a6ccfe (diff) | |
Merge branch 'travis'
Diffstat (limited to 'tests/CTestCustom.template')
| -rw-r--r-- | tests/CTestCustom.template | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/CTestCustom.template b/tests/CTestCustom.template index 3f82d73..a01f2b5 100644 --- a/tests/CTestCustom.template +++ b/tests/CTestCustom.template @@ -63,7 +63,12 @@ endif() message("running '__openscad_binpath__ --info' to generate sysinfo.txt") execute_process(COMMAND __wine__ __openscad_binpath__ --info OUTPUT_FILE sysinfo.txt) -set(CTEST_CUSTOM_POST_TEST ${CTEST_CUSTOM_POST_TEST} "__cmake_current_binary_dir__/test_pretty_print") + +if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS 2.8.12) + set(CTEST_CUSTOM_POST_TEST ${CTEST_CUSTOM_POST_TEST} "__cmake_current_binary_dir__/test_pretty_print") +else() + set(CTEST_CUSTOM_POST_TEST ${CTEST_CUSTOM_POST_TEST} "__python__ __cmake_current_source_dir__/test_pretty_print.py --builddir=__cmake_current_binary_dir__ __openscad_upload_tests__") +endif() if ( ${debug_openscad_template} ) foreach(post_test ${CTEST_CUSTOM_POST_TEST} ) |