diff options
| author | Brad King <brad.king@kitware.com> | 2011-03-08 19:22:28 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-03-08 19:22:28 (GMT) |
| commit | 5148d0b92d8e5b6ff3061f1e0a3d1bc4b00a0f8f (patch) | |
| tree | 055826d35754aa6dd07d07db980bfa7fb8830b9f /Tests/CMakeLists.txt | |
| parent | 9c1344f33bde890f7cec13962f477a914ae716c5 (diff) | |
| parent | dc9965f9a05f23615300c6ffa00b1b35b8afd58e (diff) | |
| download | CMake-5148d0b92d8e5b6ff3061f1e0a3d1bc4b00a0f8f.zip CMake-5148d0b92d8e5b6ff3061f1e0a3d1bc4b00a0f8f.tar.gz CMake-5148d0b92d8e5b6ff3061f1e0a3d1bc4b00a0f8f.tar.bz2 | |
Merge topic 'CPackRPM-enableCPackTests'
dc9965f CPackRPM do not run test if build dir contains space
e4d4dfc CPackRPM activate CPackRPM test on Linux systems where rpmbuild is found
Diffstat (limited to 'Tests/CMakeLists.txt')
| -rw-r--r-- | Tests/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index d025b1e..7235e1d 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -566,6 +566,12 @@ ${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" 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 ".* .*") + if (RPMBUILD) + list(APPEND GENLST "RPM") + endif(RPMBUILD) # set up list of component packaging ways list(APPEND CWAYLST "default") list(APPEND CWAYLST "OnePackPerGroup") |