diff options
| author |  Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2014-09-29 19:20:01 +0200 |
|---|---|---|
| committer | Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2014-09-29 19:20:01 +0200 |
| commit | 15c946338ff8c9ada9e2daa1044121115d45a0f6 (patch) | |
| tree | 040c62040a4f5efb28158ec2bd798c56dce91434 /cmake | |
| parent | 56a0bbbbee6b882995e065504c15fadbcfb1a6ef (diff) | |
Related to bug #880: Accept make as well a gmake when searching the MakeCommand. And don't include \n in match expression
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/EigenConfigureTesting.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/EigenConfigureTesting.cmake b/cmake/EigenConfigureTesting.cmake index 05c8c1466..1f19e81a9 100644 --- a/cmake/EigenConfigureTesting.cmake +++ b/cmake/EigenConfigureTesting.cmake @@ -24,9 +24,9 @@ set(EIGEN_TEST_BUILD_FLAGS "" CACHE STRING "Options passed to the build command # At this stage, we can also add custom flags to the build tool through the user defined EIGEN_TEST_BUILD_FLAGS variable. file(READ "${CMAKE_CURRENT_BINARY_DIR}/DartConfiguration.tcl" EIGEN_DART_CONFIG_FILE) # try to grab the default flags -string(REGEX MATCH "MakeCommand:.*-- (.*)DefaultCTestConfigurationType" EIGEN_DUMMY ${EIGEN_DART_CONFIG_FILE}) +string(REGEX MATCH "MakeCommand:.*-- (.*)\nDefaultCTestConfigurationType" EIGEN_DUMMY ${EIGEN_DART_CONFIG_FILE}) if(NOT CMAKE_MATCH_1) -string(REGEX MATCH "MakeCommand:.*gmake (.*)DefaultCTestConfigurationType" EIGEN_DUMMY ${EIGEN_DART_CONFIG_FILE}) +string(REGEX MATCH "MakeCommand:.*make (.*)\nDefaultCTestConfigurationType" EIGEN_DUMMY ${EIGEN_DART_CONFIG_FILE}) endif() string(REGEX REPLACE "MakeCommand:.*DefaultCTestConfigurationType" "MakeCommand: ${CMAKE_COMMAND} --build . --target buildtests --config \"\${CTEST_CONFIGURATION_TYPE}\" -- ${CMAKE_MATCH_1} ${EIGEN_TEST_BUILD_FLAGS}\nDefaultCTestConfigurationType" EIGEN_DART_CONFIG_FILE2 ${EIGEN_DART_CONFIG_FILE}) |