From 8ab730f24e21d4270add76c449365105f95f419a Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Thu, 4 May 2017 17:52:09 +0200
Subject: [PATCH] CMake: rename macro GENERATE_PACKAGE_CONFIGURATION_FILES
Add DD4HEP prefix so the macro is not picked up by other packages using the original macro, which they should take from ilcutil
---
CMakeLists.txt | 2 +-
cmake/DD4hepMacros.cmake | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca35aecf2..dd1257508 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 )
+dd4hep_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 c1612ed63..5428283e5 100644
--- a/cmake/DD4hepMacros.cmake
+++ b/cmake/DD4hepMacros.cmake
@@ -67,7 +67,7 @@ ENDMACRO( DISPLAY_STD_VARIABLES )
#---------------------------------------------------------------------------
# helper macro for generating project configuration file
-MACRO( GENERATE_PACKAGE_CONFIGURATION_FILES )
+MACRO( DD4HEP_GENERATE_PACKAGE_CONFIGURATION_FILES )
#---------------------------------------------------------------------------
FOREACH( arg ${ARGN} )
@@ -98,7 +98,7 @@ MACRO( GENERATE_PACKAGE_CONFIGURATION_FILES )
VERSION ${DD4hep_VERSION}
COMPATIBILITY AnyNewerVersion )
-ENDMACRO( GENERATE_PACKAGE_CONFIGURATION_FILES )
+ENDMACRO( DD4HEP_GENERATE_PACKAGE_CONFIGURATION_FILES )
##############################################################################
--
GitLab