aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2011-02-15 12:39:45 +0100
committerGravatar Gael Guennebaud <g.gael@free.fr>2011-02-15 12:39:45 +0100
commit2f15f74218616ed82f61577ae4f9e650cd239cc6 (patch)
treea892917f6a412594dc56bc6843e36de7ef6f078b
parent578d6f7cedef14e677c7e0793de3e9d1dcc32941 (diff)
CTEST_CUSTOM_* parameter have to be put in a CTestCustum.cmake file which itself has to be in the build directory
-rw-r--r--CMakeLists.txt4
-rw-r--r--CTestConfig.cmake4
-rw-r--r--CTestCustom.cmake.in4
3 files changed, 7 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d7bace5a..fd136dd01 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -278,7 +278,7 @@ add_subdirectory(Eigen)
add_subdirectory(doc EXCLUDE_FROM_ALL)
# CMake/Ctest does not allow us to change the build command,
-# so we have to workaround by directely editing the generated DartConfiguration.tcl file
+# so we have to workaround by directly editing the generated DartConfiguration.tcl file
# save CMAKE_MAKE_PROGRAM
set(CMAKE_MAKE_PROGRAM_SAVE ${CMAKE_MAKE_PROGRAM})
# and set a fake one
@@ -297,6 +297,8 @@ set(CMAKE_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM_SAVE})
unset(CMAKE_MAKE_PROGRAM_SAVE)
unset(EIGEN_MAKECOMMAND_PLACEHOLDER)
+configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake.in ${CMAKE_BINARY_DIR}/CTestCustom.cmake)
+
if(EIGEN_LEAVE_TEST_IN_ALL_TARGET)
add_subdirectory(test) # can't do EXCLUDE_FROM_ALL here, breaks CTest
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 20c903b54..7edc9d48d 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -11,7 +11,3 @@ set(CTEST_DROP_METHOD "http")
set(CTEST_DROP_SITE "eigen.tuxfamily.org")
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=Eigen")
set(CTEST_DROP_SITE_CDASH TRUE)
-
-## A tribute to Dynamic!
-set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS "33331")
-set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS "33331") \ No newline at end of file
diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in
new file mode 100644
index 000000000..3b2bacaa0
--- /dev/null
+++ b/CTestCustom.cmake.in
@@ -0,0 +1,4 @@
+
+## A tribute to Dynamic!
+set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS "33331")
+set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS "33331")