diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-12 13:12:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-05-12 13:12:52 (GMT) |
| commit | a5bab6e1a4e55637dbde3f1a526b87e06c715283 (patch) | |
| tree | 9963ad4477b373ff928bd534252cc8321e61e4ba /Modules | |
| parent | ffd5d0922576ff1acd72c1498a6b59ce94194be7 (diff) | |
| parent | 7c103be8deb906a2c6036da6f25dd30928cc1a54 (diff) | |
| download | CMake-a5bab6e1a4e55637dbde3f1a526b87e06c715283.zip CMake-a5bab6e1a4e55637dbde3f1a526b87e06c715283.tar.gz CMake-a5bab6e1a4e55637dbde3f1a526b87e06c715283.tar.bz2 | |
Merge topic 'cpack-not-running-tests'
7c103be8 CPack: Enable DEB and RPM tests more reliably
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPackRPM.cmake | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index e672e72..cb77fb8 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -1197,18 +1197,17 @@ function(cpack_rpm_generate_package) set(CPACK_RPM_COMPRESSION_TYPE_TMP "") endif() - if(CPACK_PACKAGE_RELOCATABLE) - set(CPACK_RPM_PACKAGE_RELOCATABLE TRUE) - endif() - if(CPACK_RPM_PACKAGE_RELOCATABLE) + if(CPACK_PACKAGE_RELOCATABLE OR CPACK_RPM_PACKAGE_RELOCATABLE) if(CPACK_RPM_PACKAGE_DEBUG) message("CPackRPM:Debug: Trying to build a relocatable package") endif() if(CPACK_SET_DESTDIR AND (NOT CPACK_SET_DESTDIR STREQUAL "I_ON")) message("CPackRPM:Warning: CPACK_SET_DESTDIR is set (=${CPACK_SET_DESTDIR}) while requesting a relocatable package (CPACK_RPM_PACKAGE_RELOCATABLE is set): this is not supported, the package won't be relocatable.") + set(CPACK_RPM_PACKAGE_RELOCATABLE FALSE) else() set(CPACK_RPM_PACKAGE_PREFIX ${CPACK_PACKAGING_INSTALL_PREFIX}) # kept for back compatibility (provided external RPM spec files) cpack_rpm_prepare_relocation_paths() + set(CPACK_RPM_PACKAGE_RELOCATABLE TRUE) endif() endif() |