From 4c330ecad11e6494aef314fb3fabb75a4105e96c Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Fri, 9 Aug 2019 17:32:52 +0200
Subject: [PATCH] Fix plugin service linkage for MAC
---
CMakeLists.txt | 5 -----
cmake/DD4hepBuild.cmake | 5 +----
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14c3379b6..5594cff69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -199,11 +199,6 @@ endif()
#######################
if(APPLE)
- dd4hep_print("|++> BOOST_LIBRARY_DIR ${BOOST_LIBRARY_DIR}")
- dd4hep_print("|++> Boost_LIBRARY_DIR ${Boost_LIBRARY_DIR}")
- dd4hep_print("|++> BOOST_LIBRARY_DIRS ${BOOST_LIBRARY_DIRS}")
- dd4hep_print("|++> Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS}")
-
fill_dd4hep_library_path()
message(STATUS "DD4HEP_LIBRARY_PATH= $ENV{DD4HEP_LIBRARY_PATH}")
endif()
diff --git a/cmake/DD4hepBuild.cmake b/cmake/DD4hepBuild.cmake
index 94244d6fd..df95cccd7 100644
--- a/cmake/DD4hepBuild.cmake
+++ b/cmake/DD4hepBuild.cmake
@@ -1463,10 +1463,7 @@ endfunction()
function ( fill_dd4hep_library_path )
string(REGEX REPLACE "/lib/libCore.*" "" ROOT_ROOT ${ROOT_Core_LIBRARY})
- SET( ENV{DD4HEP_LIBRARY_PATH} ${ROOT_ROOT}/lib )
- if ( ${Boost_LIBRARY_DIRS} )
- SET( ENV{DD4HEP_LIBRARY_PATH} ${Boost_LIBRARY_DIRS}:$ENV{DD4HEP_LIBRARY_PATH} )
- endif()
+ SET( ENV{DD4HEP_LIBRARY_PATH} ${ROOT_ROOT}/lib:${Boost_LIBRARY_DIRS} )
if ( ${DD4HEP_USE_GEANT4} )
string(REGEX REPLACE "/lib/Geant4.*" "" Geant4_ROOT ${Geant4_DIR})
SET( ENV{DD4HEP_LIBRARY_PATH} ${Geant4_ROOT}/lib:$ENV{DD4HEP_LIBRARY_PATH} )
--
GitLab