From 3100da16029efd281c9492e1b466b9c6a522b85c Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Tue, 17 Jan 2012 23:28:41 +0100 Subject: [PATCH] Fix "make package_source" target. Hopefully fixes the Jenkins release builds... Also use bz2 compression only - same as for simgear. --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 442d95ffa..3d2fbd8c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,9 +33,11 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/.gitignore) else() # clean tar-balls do not contain SCM (.git/.gitignore/...) files. set(CPACK_SOURCE_IGNORE_FILES - "^${PROJECT_SOURCE_DIR}/.git;\\\\.gitignore;Makefile.am;~$;${CPACK_SOURCE_IGNORE_FILES}") + "Makefile.am;~$;${CPACK_SOURCE_IGNORE_FILES}") endif() +list (APPEND CPACK_SOURCE_IGNORE_FILES "${PROJECT_SOURCE_DIR}/.git;\\\\.gitignore") + # split version string into components, note CMAKE_MATCH_0 is the entire regexp match string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" CPACK_PACKAGE_VERSION ${FLIGHTGEAR_VERSION} ) set(CPACK_PACKAGE_VERSION_MAJOR ${CMAKE_MATCH_1}) @@ -44,7 +46,7 @@ set(CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_3}) SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING") SET(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README") -set(CPACK_SOURCE_GENERATOR TBZ2 ZIP) +set(CPACK_SOURCE_GENERATOR TBZ2) set(CPACK_SOURCE_PACKAGE_FILE_NAME "flightgear-${FLIGHTGEAR_VERSION}" CACHE INTERNAL "tarball basename") include (CPack) -- 2.39.5