kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix CPack bug #9654

Browse Source 
Eric
This commit is contained in:
Eric Noulard 2009-11-09 14:06:36 -05:00
parent 665ac8d4a4
commit 2362fdc850
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Modules/CPackRPM.cmake
View File

@ -277,8 +277,13 @@ SET(CPACK_RPM_FILE_NAME "${CPACK_OUTPUT_FILE_NAME}")
# neither escaping (as below) nor putting quotes around the path seem to help # neither escaping (as below) nor putting quotes around the path seem to help
#STRING(REGEX REPLACE " " "\\\\ " CPACK_RPM_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}") #STRING(REGEX REPLACE " " "\\\\ " CPACK_RPM_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}")
SET(CPACK_RPM_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}") SET(CPACK_RPM_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}")
# Use files tree to construct files command (spec file)
EXECUTE_PROCESS(COMMAND find -type f
COMMAND sed {s/\\.//}
WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}"
OUTPUT_VARIABLE CPACK_RPM_INSTALL_FILES)
SET(CPACK_RPM_BINARY_SPECFILE "${CPACK_RPM_ROOTDIR}/SPECS/${CPACK_RPM_PACKAGE_NAME}.spec") SET(CPACK_RPM_BINARY_SPECFILE "${CPACK_RPM_ROOTDIR}/SPECS/${CPACK_RPM_PACKAGE_NAME}.spec")
IF(CPACK_RPM_USER_BINARY_SPECFILE) IF(CPACK_RPM_USER_BINARY_SPECFILE)
# User may have specified SPECFILE just use it # User may have specified SPECFILE just use it
@ -326,6 +331,8 @@ ${CPACK_RPM_PACKAGE_DESCRIPTION}
# generated by CMake RPM generator # generated by CMake RPM generator
# we skip the _prepn _build and _install # we skip the _prepn _build and _install
# steps because CPack does that for us # steps because CPack does that for us
# WE MUST NOT DO ANYTHING in those steps because they
# may fail for non-privileged user
#p prep #p prep
#p build #p build
@ -338,9 +345,11 @@ ${CPACK_RPM_PACKAGE_DESCRIPTION}
%defattr(-,root,root,-) %defattr(-,root,root,-)
#p dir %{prefix} #p dir %{prefix}
#p {prefix}/* #p {prefix}/*
/* ${CPACK_RPM_INSTALL_FILES}
%changelog %changelog
* Sat Oct 03 2009 Kami <cmoidavid@gmail.com>
Update to handle more precisely the files section
* Mon Oct 03 2008 Erk <eric.noulard@gmail.com> * Mon Oct 03 2008 Erk <eric.noulard@gmail.com>
Update generator to handle optional dependencies using Requires Update generator to handle optional dependencies using Requires
Update DEBUG output typos. Update DEBUG output typos.