[Cmake-commits] CMake branch, next, updated. v2.8.7-2726-gd95734c

[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  d95734ca0fb78236ba2e7431d6afb4cb68c3f776 (commit)
       via  67494502f5f9990e457d3afe0af872838d5905d2 (commit)
       via  e316cbbbc32bd7711c4bbd96ab34adfa79722d79 (commit)
      from  263d9bdd64621370b1da991d7e3f0a3334643099 (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=d95734ca0fb78236ba2e7431d6afb4cb68c3f776
commit d95734ca0fb78236ba2e7431d6afb4cb68c3f776
Merge: 263d9bd 6749450
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Sun Feb 19 14:53:12 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 19 14:53:12 2012 -0500

    Merge topic 'doBuildRPM-withSpaceInTree' into next
    
    6749450 Do not build RPM if path of the build tree contains space
    e316cbb KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67494502f5f9990e457d3afe0af872838d5905d2
commit 67494502f5f9990e457d3afe0af872838d5905d2
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Sun Feb 19 20:50:27 2012 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Sun Feb 19 20:50:27 2012 +0100

    Do not build RPM if path of the build tree contains space

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 9c97828..af1df22 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -585,6 +585,14 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
   set(CTEST_package_X11_TEST ${CTEST_TEST_CPACK})
   set(CTEST_RUN_CPackComponentsForAll ${CTEST_TEST_CPACK})
 
+  if (CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CMAKE_CURRENT_BINARY_DIR MATCHES ".* .*")
+    find_program(RPMBUILD NAMES rpmbuild)
+  endif(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CMAKE_CURRENT_BINARY_DIR MATCHES ".* .*")
+  # Do not try to build RPM
+  if (NOT RPMBUILD)
+    set(CPACK_BINARY_RPM OFF)
+  endif(NOT RPMBUILD)
+
   find_program(NSIS_MAKENSIS_EXECUTABLE NAMES makensis
     PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS]
     DOC "makensis program location"

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

Summary of changes:
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 Tests/CMakeLists.txt              |    8 ++++++++
 2 files changed, 9 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake