From 067a61a7b0f1e9391dc4890089458fa09f86d8ee Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Tue, 24 Nov 2020 17:24:05 +0100
Subject: [PATCH] CMake: add CONFIG to find_package
---
CMakeLists.txt | 8 ++++----
cmake/DD4hepBuild.cmake | 2 +-
cmake/DD4hepConfig.cmake.in | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 518baf442..d206821f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,7 +120,7 @@ dd4hep_configure_output( OUTPUT "${PROJECT_BINARY_DIR}" INSTALL "${CMAKE_INSTALL
########################
# Configure ROOT
-find_package (ROOT 6.08 REQUIRED)
+find_package (ROOT 6.08 REQUIRED CONFIG)
DD4HEP_SETUP_ROOT_TARGETS()
# Configure BOOST
@@ -129,7 +129,7 @@ DD4HEP_SETUP_BOOST_TARGETS()
# Configure Geant4
if(DD4HEP_USE_GEANT4)
- find_package( Geant4 10.2.2 REQUIRED gdml ui_all vis_all )
+ find_package( Geant4 10.2.2 REQUIRED gdml ui_all vis_all CONFIG)
IF(NOT Geant4_builtin_clhep_FOUND)
SET(DD4HEP_USE_CLHEP TRUE)
ENDIF()
@@ -141,7 +141,7 @@ if(DD4HEP_USE_GEANT4)
endif()
if(DD4HEP_USE_LCIO)
- find_package(LCIO REQUIRED)
+ find_package(LCIO REQUIRED CONFIG)
DD4HEP_SETUP_LCIO_TARGETS()
endif()
@@ -150,7 +150,7 @@ IF(DD4HEP_USE_HEPMC3)
ENDIF()
if(DD4HEP_USE_TBB)
- find_package(TBB REQUIRED)
+ find_package(TBB REQUIRED CONFIG)
endif()
diff --git a/cmake/DD4hepBuild.cmake b/cmake/DD4hepBuild.cmake
index 5b5c88c08..05d9c2941 100644
--- a/cmake/DD4hepBuild.cmake
+++ b/cmake/DD4hepBuild.cmake
@@ -802,7 +802,7 @@ MACRO(DD4HEP_SETUP_GEANT4_TARGETS)
else()
IF(NOT TARGET CLHEP::CLHEP)
- FIND_PACKAGE(CLHEP REQUIRED)
+ FIND_PACKAGE(CLHEP REQUIRED CONFIG)
ENDIF()
set(CLHEP CLHEP::CLHEP)
dd4hep_debug("Using External CLHEP")
diff --git a/cmake/DD4hepConfig.cmake.in b/cmake/DD4hepConfig.cmake.in
index 48b7efaf4..1c2d2cbe7 100644
--- a/cmake/DD4hepConfig.cmake.in
+++ b/cmake/DD4hepConfig.cmake.in
@@ -56,7 +56,7 @@ if(DD4HEP_USE_GEANT4)
find_dependency(CLHEP REQUIRED CONFIG)
UNSET(CLHEP_INCLUDE_DIR)
ENDIF()
- find_dependency(Geant4 10.2.2 REQUIRED gdml ui_all vis_all)
+ find_dependency(Geant4 10.2.2 REQUIRED gdml ui_all vis_all CONFIG)
DD4HEP_SETUP_GEANT4_TARGETS()
endif()
--
GitLab