diff --git a/cmake/DD4hep.cmake b/cmake/DD4hep.cmake index 180fab2b95a4f8c0ec55704985eea8d052e84633..e55f6b7d8d4d6a6c4edc201ba1350bdcd862cee5 100644 --- a/cmake/DD4hep.cmake +++ b/cmake/DD4hep.cmake @@ -97,16 +97,12 @@ function(dd4hep_generate_rootmap_notapple library) set(libname ${CMAKE_SHARED_MODULE_PREFIX}${library}${CMAKE_SHARED_LIBRARY_SUFFIX}) #message(STATUS "DD4hep_DIR = ${DD4hep_DIR}" ) - find_package(Boost COMPONENTS filesystem) - GET_FILENAME_COMPONENT(boost_dir ${Boost_FILESYSTEM_LIBRARY} DIRECTORY) - message(STATUS " *** listcomponents: boost_dir: ${boost_dir} " ) add_custom_command(TARGET ${library} POST_BUILD COMMAND ${CMAKE_COMMAND} -Dlibname=${libname} -Drootmapfile=${rootmapfile} -Dgenmap_install_dir=${LIBRARY_OUTPUT_PATH} -DROOT_VERSION=${ROOT_VERSION} -DDD4hep_DIR=${DD4hep_DIR} - -DLD_PATH=${boost_dir} -P ${DD4hep_DIR}/cmake/MakeGaudiMap.cmake) #add_custom_command(OUTPUT ${rootmapfile} diff --git a/cmake/MakeGaudiMap.cmake b/cmake/MakeGaudiMap.cmake index 64ea089cbb7309fe7b129b227e20ff725da2f337..f560588237dd9b477ff559ddf85d8dd4fd71abed 100644 --- a/cmake/MakeGaudiMap.cmake +++ b/cmake/MakeGaudiMap.cmake @@ -7,11 +7,9 @@ message(STATUS " *** Gaudi listcomponents: Generate map for ${libname} ..." ) MESSAGE( STATUS " *** MakeGaudiMap.cmake run command : ${Gaudi_listcomponents_CMD} -o ${rootmapfile} ${libname} WORKING_DIRECTORY ${genmap_install_dir} " ) - message(STATUS " *** listcomponents: LD_PATH: ${LD_PATH} " ) if(APPLE) - SET ( ENV{DYLD_LIBRARY_PATH} ${genmap_install_dir}:$ENV{DYLD_LIBRARY_PATH}:$ENV{DD4HEP_LIBRARY_PATH}:${LD_PATH} ) - EXECUTE_PROCESS( COMMAND echo DYLD_LIBRARY_PATH = $ENV{DYLD_LIBRARY_PATH} ) - EXECUTE_PROCESS( COMMAND echo LD_PATH = ${LD_PATH} ) + SET ( ENV{DYLD_LIBRARY_PATH} ${genmap_install_dir}:${LD_PATH}:$ENV{DYLD_LIBRARY_PATH}:$ENV{DD4HEP_LIBRARY_PATH} ) + ##EXECUTE_PROCESS( COMMAND echo DYLD_LIBRARY_PATH = $ENV{DYLD_LIBRARY_PATH} ) else() SET ( ENV{LD_LIBRARY_PATH} ${genmap_install_dir}:$ENV{LD_LIBRARY_PATH} ) #SET ( ENV{LD_PRELOAD} /lib64/libglapi.so )