Skip to content
Snippets Groups Projects
Commit fece4eda authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

Merge branch 'fullsimlight_fsl_decoupling' into 'master'

Decoupling FullSimLight from FSL. Closes #80

Closes #80

See merge request !198
parents 189088f4 965c9d68
No related branches found
No related tags found
1 merge request!198Decoupling FullSimLight from FSL. Closes #80
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration # Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
# === Preamble === # === Preamble ===
cmake_minimum_required(VERSION 3.16...3.26) cmake_minimum_required(VERSION 3.16...3.26)
...@@ -49,6 +49,7 @@ option(GEOMODEL_BUILD_VISUALIZATION "Enable the build of GeoModelVisualization" ...@@ -49,6 +49,7 @@ option(GEOMODEL_BUILD_VISUALIZATION "Enable the build of GeoModelVisualization"
option(GEOMODEL_BUILD_GEOMODELG4 "Enable the build of GeoModelG4" OFF) option(GEOMODEL_BUILD_GEOMODELG4 "Enable the build of GeoModelG4" OFF)
option(GEOMODEL_BUILD_FULLSIMLIGHT "Enable the build of FullSimLight" OFF) option(GEOMODEL_BUILD_FULLSIMLIGHT "Enable the build of FullSimLight" OFF)
option(GEOMODEL_BUILD_FULLSIMLIGHT_PROFILING "Enable FullSimLight profiling targets" OFF) option(GEOMODEL_BUILD_FULLSIMLIGHT_PROFILING "Enable FullSimLight profiling targets" OFF)
option(GEOMODEL_BUILD_FSL "Enable the build of FSL and FullSimLight" OFF)
option(GEOMODEL_BUILD_ATLASEXTENSIONS "Build the Custom ATLAS Extensions" OFF) option(GEOMODEL_BUILD_ATLASEXTENSIONS "Build the Custom ATLAS Extensions" OFF)
if(GEOMODEL_BUILD_FULLSIMLIGHT_PROFILING) if(GEOMODEL_BUILD_FULLSIMLIGHT_PROFILING)
...@@ -68,6 +69,7 @@ if(GEOMODEL_BUILD_ALL) ...@@ -68,6 +69,7 @@ if(GEOMODEL_BUILD_ALL)
set(GEOMODEL_BUILD_TOOLS TRUE) set(GEOMODEL_BUILD_TOOLS TRUE)
set(GEOMODEL_BUILD_VISUALIZATION TRUE) set(GEOMODEL_BUILD_VISUALIZATION TRUE)
set(GEOMODEL_BUILD_FULLSIMLIGHT TRUE) set(GEOMODEL_BUILD_FULLSIMLIGHT TRUE)
set(GEOMODEL_BUILD_FSL TRUE)
endif() endif()
if(GEOMODEL_BUILD_TOOLS) if(GEOMODEL_BUILD_TOOLS)
...@@ -88,6 +90,12 @@ endif() ...@@ -88,6 +90,12 @@ endif()
if(GEOMODEL_BUILD_FULLSIMLIGHT) if(GEOMODEL_BUILD_FULLSIMLIGHT)
set(GEOMODEL_BUILD_GEOMODELG4 TRUE) # FullSimLight needs GeoModelG4 set(GEOMODEL_BUILD_GEOMODELG4 TRUE) # FullSimLight needs GeoModelG4
add_subdirectory(FullSimLight) add_subdirectory(FullSimLight)
list( APPEND BUILT_PACKAGES "FullSimLight")
endif()
if(GEOMODEL_BUILD_FSL)
set(GEOMODEL_BUILD_GEOMODELG4 TRUE) # FullSimLight needs GeoModelG4
add_subdirectory(FullSimLight)# FSL needs FullSimLight
add_subdirectory(FSL) add_subdirectory(FSL)
list( APPEND BUILT_PACKAGES "FullSimLight") list( APPEND BUILT_PACKAGES "FullSimLight")
list( APPEND BUILT_PACKAGES "FSL") list( APPEND BUILT_PACKAGES "FSL")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment