Skip to content
Snippets Groups Projects
Commit 6e62e40f authored by Andre Sailer's avatar Andre Sailer Committed by Marko Petric
Browse files

generate_rootmap: simplify, try to debug apple issues

parent f3f9961c
No related branches found
No related tags found
No related merge requests found
...@@ -37,13 +37,7 @@ endif() ...@@ -37,13 +37,7 @@ endif()
function( add_dd4hep_plugin libraryName ) function( add_dd4hep_plugin libraryName )
ADD_LIBRARY ( ${libraryName} ${ARGN} ) ADD_LIBRARY ( ${libraryName} ${ARGN} )
dd4hep_generate_rootmap( ${libraryName} )
if(APPLE)
dd4hep_generate_rootmap_apple( ${libraryName} )
else()
dd4hep_generate_rootmap( ${libraryName} )
endif()
install( TARGETS ${libraryName} LIBRARY DESTINATION lib ) install( TARGETS ${libraryName} LIBRARY DESTINATION lib )
endfunction() endfunction()
...@@ -78,10 +72,7 @@ function(dd4hep_generate_rootmap library) ...@@ -78,10 +72,7 @@ function(dd4hep_generate_rootmap library)
if(APPLE) if(APPLE)
SET(ENV{DYLD_LIBRARY_PATH} ${LIBRARY_OUTPUT_PATH}:$ENV{DYLD_LIBRARY_PATH}:$ENV{DD4HEP_LIBRARY_PATH} ) SET(ENV{DYLD_LIBRARY_PATH} ${LIBRARY_OUTPUT_PATH}:$ENV{DYLD_LIBRARY_PATH}:$ENV{DD4HEP_LIBRARY_PATH} )
endif() endif()
dd4hep_generate_rootmap_notapple(${library} )
endfunction()
#---------------------------------------------------------------------------------------------------
function(dd4hep_generate_rootmap_notapple library)
if ( NOT DD4hep_DIR ) if ( NOT DD4hep_DIR )
SET ( DD4hep_DIR ${CMAKE_SOURCE_DIR} ) SET ( DD4hep_DIR ${CMAKE_SOURCE_DIR} )
endif() endif()
...@@ -89,6 +80,8 @@ function(dd4hep_generate_rootmap_notapple library) ...@@ -89,6 +80,8 @@ function(dd4hep_generate_rootmap_notapple library)
add_custom_command(OUTPUT ${rootmapfile} add_custom_command(OUTPUT ${rootmapfile}
DEPENDS ${library} DEPENDS ${library}
COMMAND echo DYLD_LIBRARY_PATH: $ENV{DYLD_LIBRARY_PATH}
COMMAND echo LD_LIBRARY_PATH: $ENV{LD_LIBRARY_PATH}
COMMAND DD4hep::listcomponents -o ${rootmapfile} $<TARGET_FILE:${library}> COMMAND DD4hep::listcomponents -o ${rootmapfile} $<TARGET_FILE:${library}>
WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH} WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment