Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DD4hep
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
eic_tools
DD4hep
Commits
84c1df39
Commit
84c1df39
authored
5 years ago
by
Marko Petric
Browse files
Options
Downloads
Patches
Plain Diff
fix macOS env for tests
parent
b7c1d0b3
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
cmake/run_test.sh
+0
-1
0 additions, 1 deletion
cmake/run_test.sh
cmake/run_test_package.sh
+0
-1
0 additions, 1 deletion
cmake/run_test_package.sh
cmake/thisdd4hep.sh
+3
-1
3 additions, 1 deletion
cmake/thisdd4hep.sh
cmake/thisdd4hep_package.sh.in
+6
-2
6 additions, 2 deletions
cmake/thisdd4hep_package.sh.in
with
9 additions
and
5 deletions
cmake/run_test.sh
+
0
−
1
View file @
84c1df39
...
@@ -21,7 +21,6 @@ for i in "$@" ; do
...
@@ -21,7 +21,6 @@ for i in "$@" ; do
fi
fi
done
done
export
DYLD_LIBRARY_PATH
=
$DD4HEP_LIBRARY_PATH
echo
" #### LD_LIBRARY_PATH = :
${
LD_LIBRARY_PATH
}
"
echo
" #### LD_LIBRARY_PATH = :
${
LD_LIBRARY_PATH
}
"
echo
" #### DYLD_LIBRARY_PATH = :
${
DYLD_LIBRARY_PATH
}
"
echo
" #### DYLD_LIBRARY_PATH = :
${
DYLD_LIBRARY_PATH
}
"
...
...
This diff is collapsed.
Click to expand it.
cmake/run_test_package.sh
+
0
−
1
View file @
84c1df39
...
@@ -20,7 +20,6 @@ for i in "$@" ; do
...
@@ -20,7 +20,6 @@ for i in "$@" ; do
fi
fi
done
done
export
DYLD_LIBRARY_PATH
=
$DD4HEP_LIBRARY_PATH
echo
" #### LD_LIBRARY_PATH = :
${
LD_LIBRARY_PATH
}
"
echo
" #### LD_LIBRARY_PATH = :
${
LD_LIBRARY_PATH
}
"
echo
" #### DYLD_LIBRARY_PATH = :
${
DYLD_LIBRARY_PATH
}
"
echo
" #### DYLD_LIBRARY_PATH = :
${
DYLD_LIBRARY_PATH
}
"
...
...
This diff is collapsed.
Click to expand it.
cmake/thisdd4hep.sh
+
3
−
1
View file @
84c1df39
...
@@ -43,13 +43,15 @@ dd4hep_add_path() {
...
@@ -43,13 +43,15 @@ dd4hep_add_path() {
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
dd4hep_add_library_path
()
{
dd4hep_add_library_path
()
{
path_prefix
=
${
1
}
;
path_prefix
=
${
1
}
;
if
[
@
USE_DYLD
@
]
;
if
[
@
APPLE
@
]
;
then
then
if
[
${
DYLD_LIBRARY_PATH
}
]
;
then
if
[
${
DYLD_LIBRARY_PATH
}
]
;
then
export
DYLD_LIBRARY_PATH
=
${
path_prefix
}
:
$DYLD_LIBRARY_PATH
;
export
DYLD_LIBRARY_PATH
=
${
path_prefix
}
:
$DYLD_LIBRARY_PATH
;
export
LD_LIBRARY_PATH
=
${
path_prefix
}
:
$LD_LIBRARY_PATH
;
export
DD4HEP_LIBRARY_PATH
=
${
path_prefix
}
:
$DD4HEP_LIBRARY_PATH
;
export
DD4HEP_LIBRARY_PATH
=
${
path_prefix
}
:
$DD4HEP_LIBRARY_PATH
;
else
else
export
DYLD_LIBRARY_PATH
=
${
path_prefix
}
;
export
DYLD_LIBRARY_PATH
=
${
path_prefix
}
;
export
LD_LIBRARY_PATH
=
${
path_prefix
}
;
export
DD4HEP_LIBRARY_PATH
=
${
path_prefix
}
;
export
DD4HEP_LIBRARY_PATH
=
${
path_prefix
}
;
fi
;
fi
;
else
else
...
...
This diff is collapsed.
Click to expand it.
cmake/thisdd4hep_package.sh.in
+
6
−
2
View file @
84c1df39
#!/bin/bash
#################################################################################
#################################################################################
#
#
# Environment script for DD4hep examples - initializes DD4hep (and ROOT)
# Environment script for DD4hep examples - initializes DD4hep (and ROOT)
...
@@ -17,7 +16,12 @@ if [ @CLHEP_DIR@ ]; then
...
@@ -17,7 +16,12 @@ if [ @CLHEP_DIR@ ]; then
fi;
fi;
source ${DD4hep_DIR}/bin/thisdd4hep.sh;
source ${DD4hep_DIR}/bin/thisdd4hep.sh;
#
#
dd4hep_parse_this
${
BASH_ARGV
[0]
}
@PackageName@
;
SOURCE=${BASH_ARGV[0]}
if [ "x$SOURCE" = "x" ]; then
SOURCE=${(%):-%N} # for zsh
fi
dd4hep_parse_this $SOURCE;
#
#
#----PATH---------------------------------------------------------------------
#----PATH---------------------------------------------------------------------
dd4hep_add_path PATH ${THIS}/bin;
dd4hep_add_path PATH ${THIS}/bin;
...
...
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