diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2013-07-07 17:25:58 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2013-07-07 17:25:58 +0200 |
| commit | 0567cf96ccce95deb2d1fcd748c26e9a65b79c7a (patch) | |
| tree | 7ecf0a3bd50106b8a4e3d4d4d3815b3b9af254bc | |
| parent | 4f28ccdd0e8456391dd503928d895d3ba68c5c22 (diff) | |
Ease setting build options when running ctest -D
| -rw-r--r-- | cmake/EigenConfigureTesting.cmake | 8 | ||||
| -rw-r--r-- | lapack/CMakeLists.txt | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/cmake/EigenConfigureTesting.cmake b/cmake/EigenConfigureTesting.cmake index 6216a9009..228d29e97 100644 --- a/cmake/EigenConfigureTesting.cmake +++ b/cmake/EigenConfigureTesting.cmake @@ -24,17 +24,19 @@ set(CMAKE_MAKE_PROGRAM "@EIGEN_MAKECOMMAND_PLACEHOLDER@") # This call activates testing and generates the DartConfiguration.tcl include(CTest) +set(EIGEN_TEST_BUILD_FLAGS " " CACHE STRING "Options passed to the build command of unit tests") + # overwrite default DartConfiguration.tcl # The worarounds are different for each version of the MSVC IDE if(MSVC_IDE) if(CMAKE_MAKE_PROGRAM_SAVE MATCHES "devenv") # devenv - set(EIGEN_MAKECOMMAND_PLACEHOLDER "${CMAKE_MAKE_PROGRAM_SAVE} Eigen.sln /build \"Release\" /project buildtests \n# ") + set(EIGEN_MAKECOMMAND_PLACEHOLDER "${CMAKE_MAKE_PROGRAM_SAVE} Eigen.sln /build \"Release\" /project buildtests ${EIGEN_TEST_BUILD_FLAGS} \n# ") else() # msbuild - set(EIGEN_MAKECOMMAND_PLACEHOLDER "${CMAKE_MAKE_PROGRAM_SAVE} buildtests.vcxproj /p:Configuration=\${CTEST_CONFIGURATION_TYPE} \n# ") + set(EIGEN_MAKECOMMAND_PLACEHOLDER "${CMAKE_MAKE_PROGRAM_SAVE} buildtests.vcxproj /p:Configuration=\${CTEST_CONFIGURATION_TYPE} ${EIGEN_TEST_BUILD_FLAGS}\n# ") endif() else() # for make and nmake - set(EIGEN_MAKECOMMAND_PLACEHOLDER "${CMAKE_MAKE_PROGRAM_SAVE} buildtests") + set(EIGEN_MAKECOMMAND_PLACEHOLDER "${CMAKE_MAKE_PROGRAM_SAVE} buildtests ${EIGEN_TEST_BUILD_FLAGS}") endif() # copy ctest properties, which currently diff --git a/lapack/CMakeLists.txt b/lapack/CMakeLists.txt index b3dea61d8..7e7444326 100644 --- a/lapack/CMakeLists.txt +++ b/lapack/CMakeLists.txt @@ -108,9 +108,8 @@ install(TARGETS eigen_lapack eigen_lapack_static get_filename_component(eigen_full_path_to_testing_lapack "./testing/" ABSOLUTE) if(EXISTS ${eigen_full_path_to_testing_lapack}) - #add_subdirectory(testing) - set(BUILD_SINGLE ON) + # The following comes from lapack/TESTING/CMakeLists.txt # Get Python find_package(PythonInterp) message(STATUS "Looking for Python found - ${PYTHONINTERP_FOUND}") |