From 547040a9063be1eda1cb79affc8e9a7f8c1e0cc2 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Wed, 3 May 2017 14:06:24 +0200
Subject: [PATCH] CMake: add creation of DD4hepConfigVersion.cmake file
---
CMakeLists.txt | 2 +-
cmake/DD4hepMacros.cmake | 19 +++++--------------
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5aff3852..ca35aecf2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,7 +152,7 @@ display_std_variables()
##############################################################################
# generate and install following configuration files
-generate_package_configuration_files( DD4hepConfig.cmake DD4hepConfigVersion.cmake )
+generate_package_configuration_files( DD4hepConfig.cmake )
if(APPLE)
SET ( ENV{DD4HEP_LIBRARY_PATH} $ENV{DYLD_LIBRARY_PATH} )
else()
diff --git a/cmake/DD4hepMacros.cmake b/cmake/DD4hepMacros.cmake
index 5cd7d26ed..c1612ed63 100644
--- a/cmake/DD4hepMacros.cmake
+++ b/cmake/DD4hepMacros.cmake
@@ -86,20 +86,6 @@ MACRO( GENERATE_PACKAGE_CONFIGURATION_FILES )
ENDIF()
ENDIF()
-
- IF( ${arg} MATCHES "ConfigVersion.cmake" )
- # version configuration file
- IF( EXISTS "${PROJECT_SOURCE_DIR}/cmake/${arg}.in" )
- CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/cmake/${arg}.in"
- "${PROJECT_BINARY_DIR}/${arg}" @ONLY
- )
- INSTALL( FILES "${PROJECT_BINARY_DIR}/${arg}" DESTINATION . )
- #IF( EXISTS "${_current_dir}/MacroCheckPackageVersion.cmake" )
- # INSTALL( FILES "${_current_dir}/MacroCheckPackageVersion.cmake" DESTINATION cmake )
- #ENDIF()
- ENDIF( EXISTS "${PROJECT_SOURCE_DIR}/cmake/${arg}.in" )
- ENDIF()
-
IF( ${arg} MATCHES "LibDeps.cmake" )
EXPORT_LIBRARY_DEPENDENCIES( "${arg}" )
INSTALL( FILES "${PROJECT_BINARY_DIR}/${arg}" DESTINATION lib/cmake )
@@ -107,6 +93,11 @@ MACRO( GENERATE_PACKAGE_CONFIGURATION_FILES )
ENDFOREACH()
+ INCLUDE( CMakePackageConfigHelpers )
+ WRITE_BASIC_PACKAGE_VERSION_FILE( ${CMAKE_INSTALL_PREFIX}/DD4hepConfigVersion.cmake
+ VERSION ${DD4hep_VERSION}
+ COMPATIBILITY AnyNewerVersion )
+
ENDMACRO( GENERATE_PACKAGE_CONFIGURATION_FILES )
--
GitLab