From 2ca9f8dcb6fa8f5eb658c0bd99e49071b0f7b393 Mon Sep 17 00:00:00 2001
From: Markus Frank <markus.frank@cern.ch>
Date: Mon, 9 Sep 2013 14:29:20 +0000
Subject: [PATCH] Applied fix to generate rootmap files as suggested by Andre.
Ready for test...
---
cmake/DD4hep.cmake | 13 +++++++------
cmake/MakeRootMap.cmake | 5 +++++
2 files changed, 12 insertions(+), 6 deletions(-)
create mode 100644 cmake/MakeRootMap.cmake
diff --git a/cmake/DD4hep.cmake b/cmake/DD4hep.cmake
index 0b6be6a98..46328b4d1 100644
--- a/cmake/DD4hep.cmake
+++ b/cmake/DD4hep.cmake
@@ -9,9 +9,9 @@ function(dd4hep_generate_rootmap library)
set(libname ${CMAKE_SHARED_MODULE_PREFIX}${library}${CMAKE_SHARED_LIBRARY_SUFFIX})
add_custom_command(OUTPUT ${rootmapfile}
- COMMAND cd ${LIBRARY_OUTPUT_PATH} &&
- . ${CMAKE_BINARY_DIR}/thisdd4hep.sh &&
- genmap ${ROOT_genmap_CMD} -i ${libname} -o ${rootmapfile}
+ COMMAND ${CMAKE_COMMAND} -Dlibname=${libname} -Drootmapfile=${rootmapfile}
+ -Dgenmap_install_dir=${LIBRARY_OUTPUT_PATH}
+ -P ${CMAKE_SOURCE_DIR}/cmake/MakeRootMap.cmake
DEPENDS ${library})
add_custom_target(${library}Rootmap ALL DEPENDS ${rootmapfile})
@@ -37,8 +37,9 @@ function(dd4hep_install_library library)
set(libname ${CMAKE_SHARED_MODULE_PREFIX}${library}${CMAKE_SHARED_MODULE_SUFFIX})
add_custom_command(OUTPUT ${rootmapfile}
- COMMAND echo
- ${library} ${LIBRARY_OUTPUT_DIR}
- DEPENDS ${library})
+ SET ( ENV{LD_LIBRARY_PATH} ./:$ENV{LD_LIBRARY_PATH} )
+ COMMAND echo
+ ${library} ${LIBRARY_OUTPUT_DIR}
+ DEPENDS ${library})
add_custom_target(${library}Install ALL DEPENDS ${installfile})
endfunction()
diff --git a/cmake/MakeRootMap.cmake b/cmake/MakeRootMap.cmake
new file mode 100644
index 000000000..dd01e7d22
--- /dev/null
+++ b/cmake/MakeRootMap.cmake
@@ -0,0 +1,5 @@
+SET ( ENV{LD_LIBRARY_PATH} ./:$ENV{LD_LIBRARY_PATH} )
+EXECUTE_PROCESS( COMMAND
+ genmap -i ${libname} -o ${rootmapfile}
+ WORKING_DIRECTORY ${genmap_install_dir}
+)
--
GitLab