[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2721-gca72fce
Eric Noulard
eric.noulard at gmail.com
Fri Apr 5 06:55:08 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via ca72fce0b94fbb15ad1f4585acfa88c77e9af680 (commit)
via f055c997a5ee186eb2f264cf4425148745ba6514 (commit)
from e543f9a3617d5621f16f24a2082288cdd89a7b20 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca72fce0b94fbb15ad1f4585acfa88c77e9af680
commit ca72fce0b94fbb15ad1f4585acfa88c77e9af680
Merge: e543f9a f055c99
Author: Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Fri Apr 5 06:54:56 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 5 06:54:56 2013 -0400
Merge topic 'CPackRPM-avoidOwningSystemDirs' into next
f055c99 CPackRPM add /usr/lib64 to the list of builtin to-be-excluded path
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f055c997a5ee186eb2f264cf4425148745ba6514
commit f055c997a5ee186eb2f264cf4425148745ba6514
Author: Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Fri Apr 5 12:53:47 2013 +0200
Commit: Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Fri Apr 5 12:53:47 2013 +0200
CPackRPM add /usr/lib64 to the list of builtin to-be-excluded path
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index bd649bb..09910ff 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -226,7 +226,7 @@
##variable
# CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST - list of path to be excluded.
# Mandatory : NO
-# Default : /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/include
+# Default : /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/lib64 /usr/include
# 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 reasonable
# set of values if the variable is not defined by the user. If the variable
@@ -689,7 +689,7 @@ if (CPACK_RPM_PACKAGE_DEBUG)
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/include)
+ set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/lib64 /usr/include)
if (CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION)
message("CPackRPM:Debug: Adding ${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION} to builtin omit list.")
list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST "${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION}")
-----------------------------------------------------------------------
Summary of changes:
Modules/CPackRPM.cmake | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list