From 271a56726acc088a01b0533389648f27957e5b42 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Tue, 19 Jun 2018 16:09:40 +0200
Subject: [PATCH] DDG4: enable building with geant4 internal CLHEP
---
CMakeLists.txt | 5 +++++
DDG4/CMakeLists.txt | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c5f6ec11..12a0f3ab3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,6 +126,11 @@ add_subdirectory(DDDetectors)
add_subdirectory(DDCond)
add_subdirectory(DDAlign)
if ( DD4HEP_USE_GEANT4 )
+ if(Geant4_builtin_clhep_FOUND)
+ set(CLHEP "")
+ else()
+ set(CLHEP CLHEP)
+ endif()
add_subdirectory(DDG4)
endif()
# Note the order: DDEve partially depends on variables from DDG4!
diff --git a/DDG4/CMakeLists.txt b/DDG4/CMakeLists.txt
index df438aa03..6f6943c38 100644
--- a/DDG4/CMakeLists.txt
+++ b/DDG4/CMakeLists.txt
@@ -12,7 +12,7 @@ dd4hep_package( DDG4
USES [GEANT4 REQUIRED COMPONENTS gdml ui_all vis_all]
[ROOT REQUIRED COMPONENTS Geom GenVector RIO]
BOOST DDCore
- OPTIONAL CLHEP [XercesC QUIET]
+ OPTIONAL ${CLHEP} [XercesC QUIET]
INCLUDE_DIRS include
INSTALL_INCLUDES include/DDG4 )
MESSAGE(STATUS "CLHEP_LIBRARIES ${CLHEP_LIBRARIES} ${CLHEP_LIBRARY}")
--
GitLab