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, master has been updated
via 825baaa1b3698c40ac349f4d2daa45277e64397e (commit)
via fa23f66ad584883b3d117ca953b6539507c377ee (commit)
from 068effa4d8ad2813499a6e79b056d79a2120e1ad (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=825baaa1b3698c40ac349f4d2daa45277e64397e
commit 825baaa1b3698c40ac349f4d2daa45277e64397e
Merge: 068effa fa23f66
Author: Brad King <[email protected]>
AuthorDate: Wed Sep 27 11:35:58 2017 +0000
Commit: Kitware Robot <[email protected]>
CommitDate: Wed Sep 27 07:36:06 2017 -0400
Merge topic 'CMakeCPack-source-ignore'
fa23f66a CMakeCPack: Exclude version-control-specific files from source
package
Acked-by: Kitware Robot <[email protected]>
Merge-request: !1314
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa23f66ad584883b3d117ca953b6539507c377ee
commit fa23f66ad584883b3d117ca953b6539507c377ee
Author: Brad King <[email protected]>
AuthorDate: Tue Sep 26 08:49:28 2017 -0400
Commit: Brad King <[email protected]>
CommitDate: Tue Sep 26 08:49:28 2017 -0400
CMakeCPack: Exclude version-control-specific files from source package
diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake
index a0aacb4..dc9f0ba 100644
--- a/CMakeCPack.cmake
+++ b/CMakeCPack.cmake
@@ -245,5 +245,23 @@
configure_file("${CMake_SOURCE_DIR}/CMakeCPackOptions.cmake.in"
"${CMake_BINARY_DIR}/CMakeCPackOptions.cmake" @ONLY)
set(CPACK_PROJECT_CONFIG_FILE "${CMake_BINARY_DIR}/CMakeCPackOptions.cmake")
+set(CPACK_SOURCE_IGNORE_FILES
+ # Files specific to version control.
+ "/\\\\.git/"
+ "/\\\\.gitattributes$"
+ "/\\\\.github/"
+ "/\\\\.gitignore$"
+ "/\\\\.hooks-config$"
+
+ # Cygwin package build.
+ "/\\\\.build/"
+
+ # Temporary files.
+ "\\\\.swp$"
+ "\\\\.#"
+ "/#"
+ "~$"
+ )
+
# include CPack model once all variables are set
include(CPack)
diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in
index ad0c245..a08c97d 100644
--- a/CMakeCPackOptions.cmake.in
+++ b/CMakeCPackOptions.cmake.in
@@ -208,12 +208,6 @@ if(CPACK_GENERATOR MATCHES "IFW")
endif()
-if(CPACK_GENERATOR MATCHES "CygwinSource")
- # when packaging source make sure the .build directory is not included
- set(CPACK_SOURCE_IGNORE_FILES
- "/CVS/" "/\\.build/" "/\\.svn/" "\\.swp$" "\\.#" "/#" "~$")
-endif()
-
if("${CPACK_GENERATOR}" STREQUAL "PackageMaker")
if(CMAKE_PACKAGE_QTGUI)
set(CPACK_PACKAGE_DEFAULT_LOCATION "/Applications")
-----------------------------------------------------------------------
Summary of changes:
CMakeCPack.cmake | 18 ++++++++++++++++++
CMakeCPackOptions.cmake.in | 6 ------
2 files changed, 18 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/mailman/listinfo/cmake-commits
