From 8737230312a21225cca35b9e568071bd79e4bbec Mon Sep 17 00:00:00 2001 From: Felix Weiglhofer <weiglhofer@fias.uni-frankfurt.de> Date: Sat, 11 May 2024 15:47:19 +0000 Subject: [PATCH] Add cmake option to switch parameters and geometry to mcbm fork. --- external/CMakeLists.txt | 5 +++++ external/InstallGeometry.cmake | 7 ++++++- external/InstallParameter.cmake | 6 ++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index d084368360..0b6630140d 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -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) diff --git a/external/InstallGeometry.cmake b/external/InstallGeometry.cmake index 9e54ad1962..4b34ef7f36 100644 --- a/external/InstallGeometry.cmake +++ b/external/InstallGeometry.cmake @@ -1,7 +1,12 @@ 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} diff --git a/external/InstallParameter.cmake b/external/InstallParameter.cmake index 7a5f5942f6..667fd9d949 100644 --- a/external/InstallParameter.cmake +++ b/external/InstallParameter.cmake @@ -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} -- GitLab