summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2012-04-03 19:58:33 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-04-03 19:58:33 (GMT)
commita6100082b9aa1c4357bb0c2c0cf29f905f355669 (patch)
treee36ac4c65c6c08718742511b02fb41c43f9bc593
parent9ad3fa7e853d933e70af0a75d711ffa1d926b507 (diff)
parent3a0c60d3bf8dab326e7dc409632a70ac63e358c1 (diff)
downloadCMake-a6100082b9aa1c4357bb0c2c0cf29f905f355669.zip
CMake-a6100082b9aa1c4357bb0c2c0cf29f905f355669.tar.gz
CMake-a6100082b9aa1c4357bb0c2c0cf29f905f355669.tar.bz2
Merge topic 'CPackPM-fixAmazonLinux'
3a0c60d Override topdir from rpm command line seems necessary on Amazon linux.
-rw-r--r--Modules/CPackRPM.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 442d7c4..cba746f 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -899,6 +899,7 @@ IF(RPMBUILD_EXECUTABLE)
# Now call rpmbuild using the SPECFILE
EXECUTE_PROCESS(
COMMAND "${RPMBUILD_EXECUTABLE}" -bb
+ --define "_topdir ${CPACK_RPM_DIRECTORY}"
--buildroot "${CPACK_RPM_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}"
"${CPACK_RPM_BINARY_SPECFILE}"
WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}"