From f53d18c5225a5d112624dd1c4bfb137509b89380 Mon Sep 17 00:00:00 2001 From: Andre Sailer <andre.philippe.sailer@cern.ch> Date: Fri, 25 Jul 2014 09:13:47 +0000 Subject: [PATCH] DD4hepConfig.cmake.in: Forward the XML setup and boostw used by dd4hep Include cmake module path for FindXerces Forward the DD4HEP_USE_XERCESC variable and call DD4HEP_XML_SETUP Forward DD4HEP_USE_BOOST and call find_package boost --- cmake/DD4hepConfig.cmake.in | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/cmake/DD4hepConfig.cmake.in b/cmake/DD4hepConfig.cmake.in index 558c7fc15..99ae5065c 100644 --- a/cmake/DD4hepConfig.cmake.in +++ b/cmake/DD4hepConfig.cmake.in @@ -16,6 +16,10 @@ SET( DD4hep_ROOT "@CMAKE_INSTALL_PREFIX@" ) SET( DD4hep_VERSION "@DD4hep_VERSION@" ) +INCLUDE( ${DD4hep_ROOT}/cmake/DD4hep.cmake ) + +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${DD4hep_ROOT}/cmake/ ) + # ---------- include dirs ----------------------------------------------------- # do not store find results in cache @@ -62,11 +66,19 @@ endif() #---- build with Boost ? if(@DD4HEP_USE_BOOST@) - include_directories( @Boost_INCLUDE_DIR@ ) - add_definitions(-DDD4HEP_USE_BOOST) + set( DD4HEP_USE_BOOST True ) + find_package( Boost REQUIRED ) + include_directories( SYSTEM ${Boost_INCLUDE_DIRS} ) + add_definitions( -DDD4HEP_USE_BOOST ) endif() +#---- build with xercesc or tinyxml ? +if( @DD4HEP_USE_XERCESC@ ) + set( DD4HEP_USE_XERCESC True ) +endif() +INCLUDE( ${DD4hep_ROOT}/cmake/DD4hep_XML_setup.cmake ) + #----- APPLE ? ------- set( USE_DYLD @USE_DYLD@ ) -- GitLab