diff --git a/cmake/DD4hep.cmake b/cmake/DD4hep.cmake
index 20dc1969684faa31d9c089f8219ab9b004ea33c3..14f9cb3e550999e0a4297c9f75ba4ba42b4eb331 100644
--- a/cmake/DD4hep.cmake
+++ b/cmake/DD4hep.cmake
@@ -72,16 +72,17 @@ function(dd4hep_generate_rootmap library)
 
   if(APPLE)
     set(ENV_VAR DYLD_LIBRARY_PATH)
+    set(${ENV_VAR}_VALUE $<TARGET_FILE_DIR:${library}>:$<TARGET_FILE_DIR:DD4hep::DD4hepGaudiPluginMgr>)
   else()
     set(ENV_VAR LD_LIBRARY_PATH)
+    set(${ENV_VAR}_VALUE $<TARGET_FILE_DIR:${library}>:$<TARGET_FILE_DIR:DD4hep::DD4hepGaudiPluginMgr>:$ENV{${ENV_VAR}})
   endif()
-  SET(ENV{${ENV_VAR}} $<TARGET_FILE_DIR:${library}>:$ENV{${ENV_VAR}}:$ENV{DD4HEP_LIBRARY_PATH} )
 
   set(rootmapfile ${CMAKE_SHARED_MODULE_PREFIX}${library}.components)
 
   add_custom_command(OUTPUT ${rootmapfile}
                      DEPENDS ${library}
-                     COMMAND ${ENV_VAR}=$ENV{${ENV_VAR}} $<TARGET_FILE:DD4hep::listcomponents> -o ${rootmapfile} $<TARGET_FILE:${library}>
+                     COMMAND ${ENV_VAR}=${ENV_VAR}_VALUE $<TARGET_FILE:DD4hep::listcomponents> -o ${rootmapfile} $<TARGET_FILE_NAME:${library}>
                      WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
                      )