diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-05-07 03:59:15 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-07 03:59:15 +0400 |
commit | 770119d16f7dbee99a60d19540818892c970c4e2 (patch) | |
tree | eedfa598847472cdff72834e4708c5dc1f296932 /build_files/cmake | |
parent | 7a5b16d175345c879d823710d2a4a6146767386e (diff) |
patch from Dan Eicher, CPack/RPM working again
Diffstat (limited to 'build_files/cmake')
-rw-r--r-- | build_files/cmake/packaging.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake index ee07857db26..07c5add52b0 100644 --- a/build_files/cmake/packaging.cmake +++ b/build_files/cmake/packaging.cmake @@ -31,17 +31,20 @@ set(BUILD_REV ${MY_WC_REVISION}) # Force Package Name -set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${BLENDER_VERSION}-r${BUILD_REV}-${CPACK_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}) +set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${BLENDER_VERSION}-r${BUILD_REV}-${CMAKE_SYSTEM_PROCESSOR}) if(CMAKE_SYSTEM_NAME MATCHES "Linux") # RPM packages include(build_files/cmake/RpmBuild.cmake) if(RPMBUILD_FOUND AND NOT WIN32) set(CPACK_GENERATOR "RPM") - set(CPACK_SET_DESTDIR TRUE) + set(CPACK_RPM_PACKAGE_RELEASE "r${BUILD_REV}") + set(CPACK_SET_DESTDIR "true") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}") + set(CPACK_PACKAGE_RELOCATABLE "false") set(CPACK_RPM_PACKAGE_LICENSE "GPLv2") set(CPACK_RPM_PACKAGE_GROUP "Amusements/Graphics") + set(CPACK_RPM_USER_BINARY_SPECFILE "${CMAKE_SOURCE_DIR}/build_files/package_spec/rpm/blender.spec.in") endif() endif() |