Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cbmroot
Manage
Activity
Members
Labels
Plan
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
Computing
cbmroot
Commits
ddec9ce2
Commit
ddec9ce2
authored
2 years ago
by
Administrator
Browse files
Options
Downloads
Patches
Plain Diff
Fix config file generation
parent
4268aec2
No related branches found
No related tags found
1 merge request
!957
Use modern CMake FindPackage config
Pipeline
#19138
passed
2 years ago
Stage: build
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cmake/modules/WriteConfigFile.cmake
+1
-1
1 addition, 1 deletion
cmake/modules/WriteConfigFile.cmake
cmake/scripts/config.csh.in
+1
-1
1 addition, 1 deletion
cmake/scripts/config.csh.in
cmake/scripts/config.sh.in
+1
-1
1 addition, 1 deletion
cmake/scripts/config.sh.in
with
3 additions
and
3 deletions
cmake/modules/WriteConfigFile.cmake
+
1
−
1
View file @
ddec9ce2
...
@@ -135,7 +135,7 @@ MACRO (WRITE_CONFIG_FILE filename)
...
@@ -135,7 +135,7 @@ MACRO (WRITE_CONFIG_FILE filename)
CONVERT_LIST_TO_STRING
(
${
PYTHONPATH
}
)
CONVERT_LIST_TO_STRING
(
${
PYTHONPATH
}
)
SET
(
MY_PYTHONPATH
${
output
}
)
SET
(
MY_PYTHONPATH
${
output
}
)
SET
(
PATH
${
ROOT
SYS
}
/bin
${
PATH
}
)
SET
(
PATH
${
ROOT
_BINDIR
}
${
PATH
}
)
UNIQUE
(
PATH
"
${
PATH
}
"
)
UNIQUE
(
PATH
"
${
PATH
}
"
)
CONVERT_LIST_TO_STRING
(
${
PATH
}
)
CONVERT_LIST_TO_STRING
(
${
PATH
}
)
Set
(
MY_PATH
${
output
}
)
Set
(
MY_PATH
${
output
}
)
...
...
This diff is collapsed.
Click to expand it.
cmake/scripts/config.csh.in
+
1
−
1
View file @
ddec9ce2
...
@@ -5,7 +5,7 @@ setenv System_ "@_system@"
...
@@ -5,7 +5,7 @@ setenv System_ "@_system@"
. @_BINDIR@/check_system.csh
. @_BINDIR@/check_system.csh
if ( "$same_system" == "1" ) then
if ( "$same_system" == "1" ) then
setenv SIMPATH "@SIMPATH@"
setenv SIMPATH "@SIMPATH@"
setenv ROOTSYS "@
ROOTSYS
@"
setenv ROOTSYS "@
SIMPATH
@"
setenv FAIRROOTPATH "@FAIRROOTPATH@"
setenv FAIRROOTPATH "@FAIRROOTPATH@"
if ( @FULL_CONFIG_FILE@ == true ) then
if ( @FULL_CONFIG_FILE@ == true ) then
setenv Geant4_INCLUDE_DIRS "@Geant4_INCLUDE_DIRS@"
setenv Geant4_INCLUDE_DIRS "@Geant4_INCLUDE_DIRS@"
...
...
This diff is collapsed.
Click to expand it.
cmake/scripts/config.sh.in
+
1
−
1
View file @
ddec9ce2
...
@@ -5,7 +5,7 @@ export System_="@_system@"
...
@@ -5,7 +5,7 @@ export System_="@_system@"
.
@_BINDIR@/check_system.sh
.
@_BINDIR@/check_system.sh
if
[
$same_system
-eq
1
]
;
then
if
[
$same_system
-eq
1
]
;
then
export
SIMPATH
=
"@SIMPATH@"
export
SIMPATH
=
"@SIMPATH@"
export
ROOTSYS
=
"@
ROOTSYS
@"
export
ROOTSYS
=
"@
SIMPATH
@"
export
FAIRROOTPATH
=
"@FAIRROOTPATH@"
export
FAIRROOTPATH
=
"@FAIRROOTPATH@"
if
(
@FULL_CONFIG_FILE@
)
;
then
if
(
@FULL_CONFIG_FILE@
)
;
then
export
Geant4_INCLUDE_DIRS
=
"@Geant4_INCLUDE_DIRS@"
export
Geant4_INCLUDE_DIRS
=
"@Geant4_INCLUDE_DIRS@"
...
...
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