diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-04-05 13:58:27 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-04-05 13:58:27 (GMT) |
| commit | 139439f0675ec05e936fd4297086462037cd618e (patch) | |
| tree | 57ce35bdd7c35622be3ae0e39e1ad08f4d10c843 /contrib | |
| parent | 56ca9f86616ff65ac1c7546af4a8aeab2d982244 (diff) | |
| download | uscxml-139439f0675ec05e936fd4297086462037cd618e.zip uscxml-139439f0675ec05e936fd4297086462037cd618e.tar.gz uscxml-139439f0675ec05e936fd4297086462037cd618e.tar.bz2 | |
Make ctest respect custom config
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ctest/common.ctest.inc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/contrib/ctest/common.ctest.inc b/contrib/ctest/common.ctest.inc index ed0aa48..4fa5829 100644 --- a/contrib/ctest/common.ctest.inc +++ b/contrib/ctest/common.ctest.inc @@ -71,9 +71,9 @@ set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"${CTEST_SOURCE_DIRECTO ### Test! ################################################################ # clean build directory for everything but continuous tests -#if (NOT ${CTEST_SUBMIT_TYPE} MATCHES ".*Continuous.*") +if (NOT ${CTEST_SUBMIT_TYPE} MATCHES ".*Continuous.*") ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY}) -#endif() +endif() ctest_start(${CTEST_SUBMIT_TYPE}) # start testing # @@ -84,6 +84,12 @@ ctest_start(${CTEST_SUBMIT_TYPE}) # start testing ctest_configure() # run cmake +if(EXISTS "${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake") + include(${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake) +elseif(EXISTS "${CTEST_BINARY_DIRECTORY}/CTestCustom.ctest") + include(${CTEST_BINARY_DIRECTORY}/CTestCustom.ctest) +endif() + if (CTEST_TOOLCHAIN) # # We do not want to build the tests everytime we compile something, but we cannot |