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
87372303
Commit
87372303
authored
10 months ago
by
Felix Weiglhofer
Browse files
Options
Downloads
Patches
Plain Diff
Add cmake option to switch parameters and geometry to mcbm fork.
parent
0c78dccb
No related branches found
No related tags found
1 merge request
!1826
Add cmake option to switch parameters and geometry to mcbm fork.
Pipeline
#29481
passed
10 months ago
Stage: package
Stage: verify
Stage: documentation
Stage: deploy
Changes
3
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
external/CMakeLists.txt
+5
-0
5 additions, 0 deletions
external/CMakeLists.txt
external/InstallGeometry.cmake
+6
-1
6 additions, 1 deletion
external/InstallGeometry.cmake
external/InstallParameter.cmake
+6
-0
6 additions, 0 deletions
external/InstallParameter.cmake
with
17 additions
and
1 deletion
external/CMakeLists.txt
+
5
−
0
View file @
87372303
...
...
@@ -6,6 +6,11 @@
# it off execept for the checker.
Option
(
DOWNLOAD_EXTERNALS
"Download the code from the external repositories."
ON
)
Option
(
CBM_MCBM_PARS
"Download mCBM forks for geometry and parameters"
OFF
)
if
(
CBM_MCBM_PARS
)
message
(
WARNING
"MCBM PARS ENABLED: Using mcbm forks of parameters and geometry."
)
endif
()
if
(
DOWNLOAD_EXTERNALS
)
Include
(
InstallFlesnet.cmake
)
Set
(
FLES_IPC_INCLUDE_DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
/flesnet/lib/fles_ipc PARENT_SCOPE
)
...
...
This diff is collapsed.
Click to expand it.
external/InstallGeometry.cmake
+
6
−
1
View file @
87372303
set
(
GEOMETRY_VERSION 4d9bfb87b3b8bf0adc298fa424976f8fbe9827db
)
set
(
GEOMETRY_SRC_URL
"https://git.cbm.gsi.de/CbmSoft/cbmroot_geometry.git"
)
if
(
CBM_MCBM_PARS
)
# Override defaults to use mcbm fork instead
set
(
GEOMETRY_VERSION mcbm24_master
)
set
(
GEOMETRY_SRC_URL https://git.cbm.gsi.de/mcbm/cbmroot_geometry.git
)
endif
()
download_project_if_needed
(
PROJECT Geometry_source
GIT_REPOSITORY
${
GEOMETRY_SRC_URL
}
GIT_TAG
${
GEOMETRY_VERSION
}
...
...
This diff is collapsed.
Click to expand it.
external/InstallParameter.cmake
+
6
−
0
View file @
87372303
...
...
@@ -2,6 +2,12 @@ set(PARAMETER_VERSION eef953885621eda9395f9c6e6e089bc3cd160c5e) # 2024-05-11
set
(
PARAMETER_SRC_URL
"https://git.cbm.gsi.de/CbmSoft/cbmroot_parameter.git"
)
if
(
CBM_MCBM_PARS
)
# Override defaults to use mcbm fork instead
set
(
PARAMETER_VERSION mcbm24_master
)
set
(
PARAMETER_SRC_URL
"https://git.cbm.gsi.de/mcbm/cbmroot_parameter.git"
)
endif
()
download_project_if_needed
(
PROJECT Parameter_source
GIT_REPOSITORY
${
PARAMETER_SRC_URL
}
GIT_TAG
${
PARAMETER_VERSION
}
...
...
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