diff options
| author | Brad King <brad.king@kitware.com> | 2011-01-19 19:28:05 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-01-19 19:28:05 (GMT) |
| commit | 6c075284f61b4abce8feb79779b6222987f26697 (patch) | |
| tree | 6deedb2648e85820194d3cc1ec104c75e498eeb8 /Tests | |
| parent | ab8ea7c413e77fbd7fc0c5a00edddfad4928c8e3 (diff) | |
| parent | 19cb2ca47f2678a9eafc16f821fc786d3d8f5d0b (diff) | |
| download | CMake-6c075284f61b4abce8feb79779b6222987f26697.zip CMake-6c075284f61b4abce8feb79779b6222987f26697.tar.gz CMake-6c075284f61b4abce8feb79779b6222987f26697.tar.bz2 | |
Merge topic 'test-SubDirSpaces-workaround-gnu-make-3.82'
19cb2ca Disable SubDirSpaces parens with GNU Make 3.82 (#11654)
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/SubDirSpaces/CMakeLists.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Tests/SubDirSpaces/CMakeLists.txt b/Tests/SubDirSpaces/CMakeLists.txt index a647fef..879530b 100644 --- a/Tests/SubDirSpaces/CMakeLists.txt +++ b/Tests/SubDirSpaces/CMakeLists.txt @@ -13,7 +13,15 @@ set(CMAKE_PAREN TRUE) IF("${CMAKE_MAKE_PROGRAM}" MATCHES "wmake") message("wmake does not support () in path") set(CMAKE_PAREN FALSE) -ENDIF("${CMAKE_MAKE_PROGRAM}" MATCHES "wmake") +elseif("${CMAKE_MAKE_PROGRAM}" MATCHES "make") + execute_process(COMMAND ${CMAKE_MAKE_PROGRAM} no_such_target --version + RESULT_VARIABLE res OUTPUT_VARIABLE out ERROR_VARIABLE out) + if("${out}" MATCHES "GNU Make 3.82") + # GNU Make 3.82 fails on parens: http://savannah.gnu.org/bugs/?30612 + message(STATUS "GNU Make 3.82 sometimes fails on () in path") + set(CMAKE_PAREN FALSE) + endif() +endif() IF(CMAKE_PAREN) ADD_DEFINITIONS(-DCMAKE_PAREN=1) |