From 67b75d70c80e9f19584d08bff30bef4497f7c6f9 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Mon, 26 Aug 2019 11:33:53 +0200
Subject: [PATCH] Cmake: tweak config when needing external CLHEP
---
CMakeLists.txt | 3 +++
cmake/DD4hepConfig.cmake.in | 5 +++++
2 files changed, 8 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 258161b09..7b26745ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,6 +100,9 @@ DD4HEP_SETUP_BOOST_TARGETS()
# Configure Geant4
if(DD4HEP_USE_GEANT4)
find_package( Geant4 10.2.2 REQUIRED gdml ui_all vis_all )
+ IF(NOT Geant4_builtin_clhep_FOUND)
+ SET(DD4HEP_USE_CLHEP TRUE)
+ ENDIF()
DD4HEP_SETUP_GEANT4_TARGETS()
# Geant4 sets the CLHEP include directory to include_directories, we undo this here
# we don't do this inside DD4hep_SETUP_GEANT4_TARGETS, because that is also used in
diff --git a/cmake/DD4hepConfig.cmake.in b/cmake/DD4hepConfig.cmake.in
index 8a6ce4fb0..fef9bfbeb 100644
--- a/cmake/DD4hepConfig.cmake.in
+++ b/cmake/DD4hepConfig.cmake.in
@@ -26,6 +26,7 @@ set ( DD4hep_ROOT "${_thisdir}" )
set ( DD4hep_VERSION "@DD4hep_VERSION@" )
set ( DD4hep_SOVERSION "@DD4hep_SOVERSION@" )
set ( DD4HEP_USE_GEANT4 "@DD4HEP_USE_GEANT4@" )
+set ( DD4hep_USE_CLHEP "@DD4HEP_USE_CLHEP@" )
set ( DD4HEP_USE_LCIO "@DD4HEP_USE_LCIO@" )
set ( DD4HEP_USE_XERCESC "@DD4HEP_USE_XERCESC@" )
set ( DD4hep_BUILD_CXX_STANDARD @CMAKE_CXX_STANDARD@ )
@@ -48,6 +49,10 @@ DD4HEP_SETUP_BOOST_TARGETS()
if(DD4HEP_USE_GEANT4)
MESSAGE(STATUS "DD4hep uses Geant4")
+ IF(DD4HEP_USE_CLHEP)
+ find_package(CLHEP REQUIRED CONFIG)
+ UNSET(CLHEP_INCLUDE_DIR)
+ ENDIF()
find_package(Geant4 10.2.2 REQUIRED gdml ui_all vis_all)
DD4HEP_SETUP_GEANT4_TARGETS()
endif()
--
GitLab