Preserve LD_LIBRARY_PATH entries (#16)

* Reapply "Set LD_LIBRARY_PATH and ROOT_INCLUDE_PATH within CheckClassVersion (#15)" This reverts commit edc0b1d. * Preserve existing LD_LIBRARY_PATH entries. * Use simpler string concatenation. Co-authored-by: Chris Green <[email protected]> * Accommodate macOS systems. * Correctly account for macOS systems. --------- Co-authored-by: Chris Green <[email protected]>
FNALssi · Nov 27, 2023 · dd3fcb2 · dd3fcb2
1 parent 61cee84
commit dd3fcb2
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/Modules/CheckClassVersion.cmake b/Modules/CheckClassVersion.cmake
@@ -135,6 +135,17 @@ function(check_class_version)
       list(APPEND CMD_ENV "${ev}=$ENV{${ev}}")
     endif()
   endforeach()
+  if (TARGET ${dictname}_dict)
+    set(LD_PATH_FOR_DICT "$<JOIN:$<TARGET_PROPERTY:${dictname}_dict,LINK_DIRECTORIES>,:>")
+    if (APPLE)
+      set(DY DY)
+    else()
+      set(DY)
+    endif()
+    string(JOIN ":" LD_PATH_FOR_DICT "${LD_PATH_FOR_DICT}" $ENV{${DY}LD_LIBRARY_PATH})
+    list(APPEND CMD_ENV "${DY}LD_LIBRARY_PATH=${LD_PATH_FOR_DICT}")
+    list(APPEND CMD_ENV "ROOT_INCLUDE_PATH=$<JOIN:$<TARGET_PROPERTY:${dictname}_dict,INCLUDE_DIRECTORIES>,:>")
+  endif()
   # Add the check to the end of the dictionary building step.
   add_custom_command(OUTPUT ${dictname}_dict_checked
     COMMAND ${CMAKE_COMMAND} -E env ${CMD_ENV} ${CCV_ENVIRONMENT}