Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DD4hep
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cepc
externals
mirroring
DD4hep
Commits
6e62e40f
Commit
6e62e40f
authored
5 years ago
by
Andre Sailer
Committed by
Marko Petric
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
generate_rootmap: simplify, try to debug apple issues
parent
f3f9961c
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cmake/DD4hep.cmake
+4
-11
4 additions, 11 deletions
cmake/DD4hep.cmake
with
4 additions
and
11 deletions
cmake/DD4hep.cmake
+
4
−
11
View file @
6e62e40f
...
...
@@ -37,13 +37,7 @@ endif()
function
(
add_dd4hep_plugin libraryName
)
ADD_LIBRARY
(
${
libraryName
}
${
ARGN
}
)
if
(
APPLE
)
dd4hep_generate_rootmap_apple
(
${
libraryName
}
)
else
()
dd4hep_generate_rootmap
(
${
libraryName
}
)
endif
()
dd4hep_generate_rootmap
(
${
libraryName
}
)
install
(
TARGETS
${
libraryName
}
LIBRARY DESTINATION lib
)
endfunction
()
...
...
@@ -78,10 +72,7 @@ function(dd4hep_generate_rootmap library)
if
(
APPLE
)
SET
(
ENV{DYLD_LIBRARY_PATH}
${
LIBRARY_OUTPUT_PATH
}
:$ENV{DYLD_LIBRARY_PATH}:$ENV{DD4HEP_LIBRARY_PATH}
)
endif
()
dd4hep_generate_rootmap_notapple
(
${
library
}
)
endfunction
()
#---------------------------------------------------------------------------------------------------
function
(
dd4hep_generate_rootmap_notapple library
)
if
(
NOT DD4hep_DIR
)
SET
(
DD4hep_DIR
${
CMAKE_SOURCE_DIR
}
)
endif
()
...
...
@@ -89,6 +80,8 @@ function(dd4hep_generate_rootmap_notapple library)
add_custom_command
(
OUTPUT
${
rootmapfile
}
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
}
>
WORKING_DIRECTORY
${
LIBRARY_OUTPUT_PATH
}
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment