[Cmake-commits] CMake branch, next, updated. v2.8.4-1095-g375d9ea

[Eric Noulard]

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  375d9eac7333c3a8f442f24223a8e5e5bca50846 (commit)
       via  dc9965f9a05f23615300c6ffa00b1b35b8afd58e (commit)
      from  0a4aa63b2779ec3b3885ba341859c84a2c91e27f (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=375d9eac7333c3a8f442f24223a8e5e5bca50846
commit 375d9eac7333c3a8f442f24223a8e5e5bca50846
Merge: 0a4aa63 dc9965f
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Fri Mar 4 16:17:46 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 4 16:17:46 2011 -0500

    Merge topic 'CPackRPM-enableCPackTests' into next
    
    dc9965f CPackRPM  do not run test if build dir contains space


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc9965f9a05f23615300c6ffa00b1b35b8afd58e
commit dc9965f9a05f23615300c6ffa00b1b35b8afd58e
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Fri Mar 4 22:17:10 2011 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Fri Mar 4 22:17:10 2011 +0100

    CPackRPM  do not run test if build dir contains space

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index b27477c..ad1ef60 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -566,9 +566,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     set(CPackRun_CPackCommand "-DCPackCommand=${CMAKE_CPACK_COMMAND}")
     # set up list of CPack generators
     list(APPEND GENLST "ZIP")
-    if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+    if (CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CMAKE_CURRENT_BINARY_DIR MATCHES ".* .*")
         find_program(RPMBUILD NAMES rpmbuild)
-    endif(CMAKE_SYSTEM_NAME MATCHES "Linux")
+    endif(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CMAKE_CURRENT_BINARY_DIR MATCHES ".* .*")
     if (RPMBUILD)
        list(APPEND GENLST "RPM")
     endif(RPMBUILD)

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

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


hooks/post-receive
-- 
CMake