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
7d89a650
Commit
7d89a650
authored
4 years ago
by
Marko Petric
Browse files
Options
Downloads
Patches
Plain Diff
add package argument to dd4hep_parse_this
parent
84c1df39
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake/thisdd4hep.sh
+5
-4
5 additions, 4 deletions
cmake/thisdd4hep.sh
cmake/thisdd4hep_package.sh.in
+1
-1
1 addition, 1 deletion
cmake/thisdd4hep_package.sh.in
with
6 additions
and
5 deletions
cmake/thisdd4hep.sh
+
5
−
4
View file @
7d89a650
...
...
@@ -11,13 +11,14 @@
#-----------------------------------------------------------------------------
dd4hep_parse_this
()
{
SOURCE
=
${
1
}
package
=
${
2
}
;
if
[
"x
${
SOURCE
}
"
=
"x"
]
;
then
if
[
-f
bin/this
dd4hep
.sh
]
;
then
if
[
-f
bin/this
${
package
}
.sh
]
;
then
THIS
=
"
$PWD
"
;
export
THIS
elif
[
-f
./this
dd4hep
.sh
]
;
then
elif
[
-f
./this
${
package
}
.sh
]
;
then
THIS
=
$(
cd
..
>
/dev/null
;
pwd
)
;
export
THIS
else
echo
ERROR: must
"cd where/
dd4hep
/is"
before calling
". bin/this
dd4hep
.sh"
for
this version of bash!
echo
ERROR: must
"cd where/
${
package
}
/is"
before calling
". bin/this
${
package
}
.sh"
for
this version of bash!
THIS
=
;
export
THIS
return
1
fi
...
...
@@ -69,7 +70,7 @@ if [ "x$SOURCE" = "x" ]; then
SOURCE
=
${
(%)
:-
%N
}
# for zsh
fi
dd4hep_parse_this
$SOURCE
;
dd4hep_parse_this
$SOURCE
@PackageName@
;
#
# These 3 are the main configuration variables: ROOT, Geant4 and XercesC
# --> LCIO & Co. are handled elsewhere!
...
...
This diff is collapsed.
Click to expand it.
cmake/thisdd4hep_package.sh.in
+
1
−
1
View file @
7d89a650
...
...
@@ -21,7 +21,7 @@ if [ "x$SOURCE" = "x" ]; then
SOURCE=${(%):-%N} # for zsh
fi
dd4hep_parse_this $SOURCE;
dd4hep_parse_this $SOURCE
@PackageName@
;
#
#----PATH---------------------------------------------------------------------
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