summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-09-27 11:35:58 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-09-27 11:36:06 (GMT)
commit825baaa1b3698c40ac349f4d2daa45277e64397e (patch)
treea69b03b77de463bc7982c7e7bcdf5d8adf03b926
parent068effa4d8ad2813499a6e79b056d79a2120e1ad (diff)
parentfa23f66ad584883b3d117ca953b6539507c377ee (diff)
downloadCMake-825baaa1b3698c40ac349f4d2daa45277e64397e.zip
CMake-825baaa1b3698c40ac349f4d2daa45277e64397e.tar.gz
CMake-825baaa1b3698c40ac349f4d2daa45277e64397e.tar.bz2
Merge topic 'CMakeCPack-source-ignore'
fa23f66a CMakeCPack: Exclude version-control-specific files from source package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1314
-rw-r--r--CMakeCPack.cmake18
-rw-r--r--CMakeCPackOptions.cmake.in6
2 files changed, 18 insertions, 6 deletions
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")