summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2012-02-21 20:57:30 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-02-21 20:57:30 (GMT)
commitb187a3a8168dd237e17e6e3e8a2c2dd1cb1a7f61 (patch)
tree621332dfa1cf7a1e5357c40cbc7dc8c8144a26b2 /Tests
parent7d02020d682018a541b10460b28d6a8d0ef9bcf3 (diff)
parent67494502f5f9990e457d3afe0af872838d5905d2 (diff)
downloadCMake-b187a3a8168dd237e17e6e3e8a2c2dd1cb1a7f61.zip
CMake-b187a3a8168dd237e17e6e3e8a2c2dd1cb1a7f61.tar.gz
CMake-b187a3a8168dd237e17e6e3e8a2c2dd1cb1a7f61.tar.bz2
Merge topic 'doBuildRPM-withSpaceInTree'
6749450 Do not build RPM if path of the build tree contains space
Diffstat (limited to 'Tests')
-rw-r--r--Tests/CMakeLists.txt8
1 files changed, 8 insertions, 0 deletions
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"