diff options
author | Brad King <brad.king@kitware.com> | 2017-09-22 14:14:13 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2017-09-22 14:14:23 (GMT) |
commit | 9c20ef95e01f97849e0a4008ac732c823a067ce5 (patch) | |
tree | 26b10f2f4b956ba4aa1ba3565df30a94ace1467f | |
parent | a6f2ea6adae8ec1a15f2bb25f4fe12c2564577c5 (diff) | |
parent | 545d9a17e5f0605d3bbbf9e16baa427ef254a4ae (diff) | |
download | CMake-9c20ef95e01f97849e0a4008ac732c823a067ce5.zip CMake-9c20ef95e01f97849e0a4008ac732c823a067ce5.tar.gz CMake-9c20ef95e01f97849e0a4008ac732c823a067ce5.tar.bz2 |
Merge topic 'cpack-rpm-extend-exclude-from-auto-filelist'
545d9a17 CPack/RPM: new CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST exclude paths
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1299
-rw-r--r-- | Modules/CPackRPM.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index 3913494..a770f04 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -530,7 +530,9 @@ # list of path to be excluded. # # * Mandatory : NO -# * Default : /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/lib64 /usr/include +# * Default : /etc /etc/init.d /usr /usr/bin /usr/include /usr/lib +# /usr/libx32 /usr/lib64 /usr/share /usr/share/aclocal +# /usr/share/doc # # May be used to exclude path (directories or files) from the auto-generated # list of paths discovered by CPack RPM. The defaut value contains a @@ -1083,7 +1085,9 @@ function(cpack_rpm_prepare_content_list) endif() if(NOT DEFINED CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST) - set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/lib64 /usr/libx32 /usr/include) + set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST /etc /etc/init.d /usr /usr/bin + /usr/include /usr/lib /usr/libx32 /usr/lib64 + /usr/share /usr/share/aclocal /usr/share/doc ) if(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION) if(CPACK_RPM_PACKAGE_DEBUG) message("CPackRPM:Debug: Adding ${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION} to builtin omit list.") |