diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2009-10-05 07:42:31 -0400 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2009-10-05 07:42:31 -0400 |
| commit | fa9fc1397ba29806da9aa29776b2b9d3830fbdb9 (patch) | |
| tree | 8e1ec7d825d8691fa85343a29c24e791eb65e5a7 | |
| parent | b78b2ede5f6156c8898c152335176cbd47c34bdb (diff) | |
next attempt ... introduce EIGEN_CMAKE_RUN_FROM_CTEST, in that case don't EXCLUDE_FROM_ALL
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | test/testsuite.cmake | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c3b63bc55..36b2be99f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,7 +124,11 @@ add_subdirectory(doc EXCLUDE_FROM_ALL) include(CTest) enable_testing() # must be called from the root CMakeLists, see man page -add_subdirectory(test EXCLUDE_FROM_ALL) # can't do EXCLUDE_FROM_ALL here, breaks CTest +if(EIGEN_CMAKE_RUN_FROM_CTEST) +add_subdirectory(test) # can't do EXCLUDE_FROM_ALL here, breaks CTest +else(EIGEN_CMAKE_RUN_FROM_CTEST) +add_subdirectory(test EXCLUDE_FROM_ALL) +endif(EIGEN_CMAKE_RUN_FROM_CTEST) add_subdirectory(unsupported) diff --git a/test/testsuite.cmake b/test/testsuite.cmake index 37ee87565..c6cc07369 100644 --- a/test/testsuite.cmake +++ b/test/testsuite.cmake @@ -148,7 +148,7 @@ endif(NOT EIGEN_NO_UPDATE) # which ctest command to use for running the dashboard SET (CTEST_COMMAND "${EIGEN_CMAKE_DIR}ctest -D ${EIGEN_MODE}") # what cmake command to use for configuring this dashboard -SET (CTEST_CMAKE_COMMAND "${EIGEN_CMAKE_DIR}cmake -DEIGEN_BUILD_TESTS=on ") +SET (CTEST_CMAKE_COMMAND "${EIGEN_CMAKE_DIR}cmake -DEIGEN_CMAKE_RUN_FROM_CTEST=on -DEIGEN_BUILD_TESTS=on ") #################################################################### # The values in this section are optional you can either |