From a6093b6a4163e45ec9622477cce4b57976b4de7e Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
Date: Mon, 18 Jan 2016 16:22:52 +0100
Subject: [PATCH] Changes proposed by Marco
---
CMakeLists.txt | 12 +++++++++---
cmake/GaudiCPackSettings.cmake | 26 ++++++++++++++++++++++++++
cmake/GaudiProjectConfig.cmake | 29 -----------------------------
3 files changed, 35 insertions(+), 32 deletions(-)
create mode 100644 cmake/GaudiCPackSettings.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ae6f21b75..2e428b2e0b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,13 @@ gaudi_add_test(cmake.CMakeModules
gaudi_add_test(cmake.QMTDeps
COMMAND nosetests --with-doctest ${CMAKE_SOURCE_DIR}/cmake/extract_qmtest_metadata.py)
-# Generate binary RPMs from the project for ATLAS:
-if( GAUDI_ATLAS )
- atlas_cpack_setup()
+# Configure how CPack should run:
+find_file( _cpack_config NAMES GaudiCPackSettings.cmake
+ PATHS ${CMAKE_MODULE_PATH} )
+if( _cpack_config )
+ include( ${_cpack_config} )
+else()
+ message( WARNING "Could not find GaudiCPackSettings.cmake" )
endif()
+unset( _cpack_config )
+mark_as_advanced( _cpack_config )
diff --git a/cmake/GaudiCPackSettings.cmake b/cmake/GaudiCPackSettings.cmake
new file mode 100644
index 0000000000..d0b3c3680d
--- /dev/null
+++ b/cmake/GaudiCPackSettings.cmake
@@ -0,0 +1,26 @@
+#--- CPack configuration
+set(CPACK_PACKAGE_NAME ${project})
+foreach(t MAJOR MINOR PATCH)
+ set(CPACK_PACKAGE_VERSION_${t} ${CMAKE_PROJECT_VERSION_${t}})
+endforeach()
+set(CPACK_SYSTEM_NAME ${BINARY_TAG})
+
+set(CPACK_SOURCE_IGNORE_FILES "/InstallArea/;/build\\\\..*/;/\\\\.svn/;/\\\\.git/;/\\\\.settings/;\\\\..*project;\\\\.gitignore")
+
+# for the binary
+set(CPACK_INSTALL_PREFIX "usr/${project}/${version}/InstallArea/${BINARY_TAG}")
+set(CPACK_INSTALL_SCRIPT "${GaudiProject_DIR}/cpack_install.cmake")
+
+# for the source
+set(CPACK_SOURCE_INSTALLED_DIRECTORIES "${CMAKE_SOURCE_DIR};/usr/${project}/${version}")
+
+# for the RPMs
+set(CPACK_PACKAGE_DEFAULT_LOCATION "/usr")
+set(CPACK_GENERATOR "RPM")
+set(CPACK_RPM_PACKAGE_VERSION "${version}")
+set(CPACK_SOURCE_GENERATOR "RPM")
+set(CPACK_SOURCE_RPM "ON")
+set(CPACK_SOURCE_RPM_PACKAGE_ARCHITECTURE "noarch")
+set(CPACK_SOURCE_RPM_PACKAGE_NAME "${project}-source")
+
+include(CPack)
diff --git a/cmake/GaudiProjectConfig.cmake b/cmake/GaudiProjectConfig.cmake
index 6a7fd19743..8f1141bb81 100644
--- a/cmake/GaudiProjectConfig.cmake
+++ b/cmake/GaudiProjectConfig.cmake
@@ -716,35 +716,6 @@ __path__ = [d for d in [os.path.join(d, '${pypack}') for d in sys.path if d]
gaudi_generate_project_manifest(${CMAKE_CONFIG_OUTPUT_DIRECTORY}/manifest.xml ${ARGV})
install(FILES ${CMAKE_CONFIG_OUTPUT_DIRECTORY}/manifest.xml DESTINATION .)
- if( NOT GAUDI_ATLAS )
- #--- CPack configuration
- set(CPACK_PACKAGE_NAME ${project})
- foreach(t MAJOR MINOR PATCH)
- set(CPACK_PACKAGE_VERSION_${t} ${CMAKE_PROJECT_VERSION_${t}})
- endforeach()
- set(CPACK_SYSTEM_NAME ${BINARY_TAG})
-
- set(CPACK_SOURCE_IGNORE_FILES "/InstallArea/;/build\\\\..*/;/\\\\.svn/;/\\\\.git/;/\\\\.settings/;\\\\..*project;\\\\.gitignore")
-
- # for the binary
- set(CPACK_INSTALL_PREFIX "usr/${project}/${version}/InstallArea/${BINARY_TAG}")
- set(CPACK_INSTALL_SCRIPT "${GaudiProject_DIR}/cpack_install.cmake")
-
- # for the source
- set(CPACK_SOURCE_INSTALLED_DIRECTORIES "${CMAKE_SOURCE_DIR};/usr/${project}/${version}")
-
- # for the RPMs
- set(CPACK_PACKAGE_DEFAULT_LOCATION "/usr")
- set(CPACK_GENERATOR "RPM")
- set(CPACK_RPM_PACKAGE_VERSION "${version}")
- set(CPACK_SOURCE_GENERATOR "RPM")
- set(CPACK_SOURCE_RPM "ON")
- set(CPACK_SOURCE_RPM_PACKAGE_ARCHITECTURE "noarch")
- set(CPACK_SOURCE_RPM_PACKAGE_NAME "${project}-source")
-
- include(CPack)
- endif()
-
endmacro()
#-------------------------------------------------------------------------------
--
GitLab