From b93cccadbcd30086661e2a1d6b7cb3e4b2e2c75c Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Fri, 23 Aug 2019 18:05:45 +0200
Subject: [PATCH] CMake: find clhep only via CONFIG mode

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46cfb29..664e55b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,6 @@ IF( MARLINTRK_USE_GEAR)
 ENDIF(MARLINTRK_USE_GEAR)
 
 
-FIND_PACKAGE( streamlog REQUIRED )
 FIND_PACKAGE( streamlog REQUIRED )
 INCLUDE_DIRECTORIES( SYSTEM  ${streamlog_INCLUDE_DIRS} )
 LINK_LIBRARIES( ${streamlog_LIBRARIES} )
@@ -80,8 +79,9 @@ INCLUDE_DIRECTORIES( SYSTEM  ${DD4hep_INCLUDE_DIRS} )
 LINK_LIBRARIES( ${DD4hep_LIBRARIES}  ${DD4hep_COMPONENT_LIBRARIES} )
 ADD_DEFINITIONS( ${DD4hep_DEFINITIONS} )
 
-
-FIND_PACKAGE( CLHEP REQUIRED ) 
+#DD4hep depends on geant4. geant4 calls find_package clhep internally and also contains a findclhep.cmake
+# that findclhep cmake is not playing nice with other things
+FIND_PACKAGE(CLHEP REQUIRED CONFIG)
 INCLUDE_DIRECTORIES( SYSTEM  ${CLHEP_INCLUDE_DIRS} )
 LINK_LIBRARIES( ${CLHEP_LIBRARIES} )
 ADD_DEFINITIONS( ${CLHEP_DEFINITIONS} )