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 | |
| parent | 56ca9f86616ff65ac1c7546af4a8aeab2d982244 (diff) | |
| download | uscxml-139439f0675ec05e936fd4297086462037cd618e.zip uscxml-139439f0675ec05e936fd4297086462037cd618e.tar.gz uscxml-139439f0675ec05e936fd4297086462037cd618e.tar.bz2 | |
Make ctest respect custom config
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | contrib/ctest/common.ctest.inc | 10 | ||||
| -rw-r--r-- | docs/BUILDING.md | 2 |
3 files changed, 10 insertions, 4 deletions
@@ -104,4 +104,4 @@ upon](https://github.com/tklab-tud/uscxml/blob/master/docs/BUILDING.md#build-dep ## Download We do not yet feature installers. Please download the source and have a look at the [build -instructions](https://github.com/tklab-tud/umundo/blob/master/docs/BUILDING.md). +instructions](https://github.com/tklab-tud/uscxml/blob/master/docs/BUILDING.md). 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 diff --git a/docs/BUILDING.md b/docs/BUILDING.md index 60a3260..c7415b1 100644 --- a/docs/BUILDING.md +++ b/docs/BUILDING.md @@ -40,7 +40,7 @@ your own. <td>>= 2.1.x</td> <td>Event queues with callbacks and the HTTP server.</td></tr> <tr> - <td><a href="http://curl.haxx.se">curl</a><br />pre-compiled</td> + <td><a href="http://curl.haxx.se">curl</a><br />required</td> <td>>= 7.29.0</td> <td>URL downloads.</td></tr> <tr> |