diff options
| author | Marius Kintel <marius@kintel.net> | 2013-10-04 07:20:03 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-10-04 07:20:03 (GMT) |
| commit | 0404a921af67a05f236f9f846243d4ffb1f74474 (patch) | |
| tree | 132607d2cbf85b9c42a35993d6d44d2c443f8bcc /tests/CTestCustom.template | |
| parent | 94070f7b51e54f64d977be90339c77521705b444 (diff) | |
| parent | 5ed3e28b7a2e3eccb084cd582e4148a7aebb3b86 (diff) | |
Merge pull request #499 from openscad/issue480
Issue480
Diffstat (limited to 'tests/CTestCustom.template')
| -rw-r--r-- | tests/CTestCustom.template | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/CTestCustom.template b/tests/CTestCustom.template index b8d04ce..3f82d73 100644 --- a/tests/CTestCustom.template +++ b/tests/CTestCustom.template @@ -51,6 +51,9 @@ if( __cmake_system_name__ MATCHES "Linux|BSD") # in the build directory). set(ENV{DISPLAY} "${VFB_DISPLAY}") + # this line is for MCAD + set(ENV{OPENSCADPATH} "__cmake_current_source_dir__/../libraries") + set(CTEST_CUSTOM_POST_TEST "__cmake_current_source_dir__/virtualfb.sh") endif() endif() @@ -58,8 +61,8 @@ endif() # Part 1. Pretty Printing -message("running '__gui_binpath__ --info' to generate sysinfo.txt") -execute_process(COMMAND __wine__ __gui_binpath__ --info OUTPUT_FILE sysinfo.txt) +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 ( ${debug_openscad_template} ) |