[Cmake-commits] CMake branch, next, updated. v2.8.3-1281-gbbbbed4

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  bbbbed44a6105c86a12d0970f7b387b5c1c13f26 (commit)
       via  19cb2ca47f2678a9eafc16f821fc786d3d8f5d0b (commit)
      from  9949318e14a67bcd070f4b090dd05cd52645f245 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bbbbed44a6105c86a12d0970f7b387b5c1c13f26
commit bbbbed44a6105c86a12d0970f7b387b5c1c13f26
Merge: 9949318 19cb2ca
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 11 10:03:03 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 11 10:03:03 2011 -0500

    Merge topic 'test-SubDirSpaces-workaround-gnu-make-3.82' into next
    
    19cb2ca Disable SubDirSpaces parens with GNU Make 3.82 (#11654)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19cb2ca47f2678a9eafc16f821fc786d3d8f5d0b
commit 19cb2ca47f2678a9eafc16f821fc786d3d8f5d0b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 11 10:01:30 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 11 10:01:30 2011 -0500

    Disable SubDirSpaces parens with GNU Make 3.82 (#11654)
    
    GNU Make 3.82 incorrectly parses make dependencies involving parentheses
    in path names.  See related upstream issue:
    
      http://savannah.gnu.org/bugs/?30612
    
    Skip testing the ()-named subdirectory.

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)

-----------------------------------------------------------------------

Summary of changes:
 Tests/SubDirSpaces/CMakeLists.txt |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake