Skip to content
Snippets Groups Projects
Commit 38f460cf authored by Marco Clemencic's avatar Marco Clemencic
Browse files

Make GaudiPartProp optional

parent 6095b845
No related branches found
No related tags found
1 merge request!1493New version of PartProp service
......@@ -56,6 +56,7 @@ after the configuration or use ccmake or cmake-gui.
* GAUDI_GENCONF_NO_FAIL
* Compile options
* GAUDI_ENABLE_GAUDIALG
* GAUDI_ENABLE_GAUDIPARTPROP
* GAUDI_REFLEX_COMPONENT_ALIASES
* Doxygen
* DOXYGEN_WITH_LOCAL_MATHJAX
......@@ -110,7 +111,10 @@ string(APPEND GAUDI_OPTIONAL_DEPENDENCIES "set(GAUDI_USE_PYTHON_MAJOR ${GAUDI_US
list(PREPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules") # (Find*.cmake)
include(cmake/GaudiDependencies.cmake)
string(APPEND GAUDI_OPTIONAL_DEPENDENCIES "set(GAUDI_ENABLE_GAUDIALG ${GAUDI_ENABLE_GAUDIALG})\n")
string(APPEND GAUDI_OPTIONAL_DEPENDENCIES "
set(GAUDI_ENABLE_GAUDIALG ${GAUDI_ENABLE_GAUDIALG})
set(GAUDI_ENABLE_GAUDIPARTPROP ${GAUDI_ENABLE_GAUDIPARTPROP})
")
# The C++ standard used must be the same as ROOT's
if(NOT GAUDI_CXX_STANDARD)
......
......@@ -76,7 +76,6 @@ gaudi_add_module(GaudiExamples
src/NTuples/NTupleAlgorithm.cpp
src/PluginService/BackwardCompatibleAliases.cpp
src/PluginService/SpecialCustomFactory.cpp
src/PartProp/PartPropAlg.cpp
src/Properties/CustomPropertiesAlg.cpp
src/Properties/PropertyAlg.cpp
src/Properties/PropertyProxy.cpp
......@@ -101,7 +100,6 @@ gaudi_add_module(GaudiExamples
Gaudi::Functional
GaudiUtilsLib
GaudiExamplesLib
GaudiPartProp
ROOT::Tree
ROOT::RIO
ROOT::Hist
......@@ -129,8 +127,7 @@ if(GAUDI_USE_AIDA)
target_link_libraries(GaudiExamples PRIVATE AIDA::aida)
endif()
if(GAUDI_USE_HEPPDT)
target_sources(GaudiExamples PRIVATE src/PartProp/GaudiPPS.cpp
src/PartProp/PartPropExa.cpp)
target_sources(GaudiExamples PRIVATE src/PartProp/PartPropExa.cpp)
target_link_libraries(GaudiExamples PRIVATE HepPDT::heppdt)
endif()
if(TARGET RootCnvLib)
......@@ -139,6 +136,13 @@ if(TARGET RootCnvLib)
src/MultiInput/MIWriteAlg.cpp)
target_link_libraries(GaudiExamples PRIVATE RootCnvLib)
endif()
if(GAUDI_ENABLE_GAUDIPARTPROP)
target_sources(GaudiExamples PRIVATE
src/PartProp/GaudiPPS.cpp
src/PartProp/PartPropAlg.cpp
)
target_link_libraries(GaudiExamples PRIVATE Gaudi::GaudiPartProp)
endif()
# Build the executable
gaudi_add_executable(Allocator
......@@ -190,6 +194,12 @@ if(BUILD_TESTING)
PROPERTIES DISABLED TRUE
)
endif()
if(NOT GAUDI_ENABLE_GAUDIPARTPROP)
set_tests_properties(
GaudiExamples.particlepropsvc
PROPERTIES DISABLED TRUE
)
endif()
endif()
gaudi_add_pytest(tests/pytest)
......
......@@ -10,6 +10,10 @@
#####################################################################################
# GaudiPartProp subdirectory
if(NOT GAUDI_ENABLE_GAUDIPARTPROP)
return()
endif()
gaudi_add_library(GaudiPartProp
SOURCES
src/CC.cpp
......
......@@ -10,4 +10,5 @@
# set(GAUDI_USE_INTELAMPLIFIER OFF CACHE BOOL "")
# set(GAUDI_USE_JEMALLOC ON CACHE BOOL "")
# set(GAUDI_ENABLE_GAUDIALG OFF CACHE BOOL "")
# set(GAUDI_ENABLE_GAUDIPARTPROP ON CACHE BOOL "")
# set(BUILD_TESTING ON CACHE BOOL "")
......@@ -10,4 +10,5 @@ set(GAUDI_USE_DOXYGEN ON CACHE BOOL "")
set(GAUDI_USE_INTELAMPLIFIER ON CACHE BOOL "")
set(GAUDI_USE_JEMALLOC ON CACHE BOOL "")
set(GAUDI_ENABLE_GAUDIALG ON CACHE BOOL "")
set(GAUDI_ENABLE_GAUDIPARTPROP ON CACHE BOOL "")
set(BUILD_TESTING ON CACHE BOOL "")
......@@ -10,4 +10,5 @@ set(GAUDI_USE_DOXYGEN OFF CACHE BOOL "")
set(GAUDI_USE_INTELAMPLIFIER OFF CACHE BOOL "")
set(GAUDI_USE_JEMALLOC OFF CACHE BOOL "")
set(GAUDI_ENABLE_GAUDIALG OFF CACHE BOOL "")
set(GAUDI_ENABLE_GAUDIPARTPROP OFF CACHE BOOL "")
set(BUILD_TESTING OFF CACHE BOOL "")
......@@ -10,4 +10,5 @@ set(GAUDI_USE_DOXYGEN ON CACHE BOOL "")
set(GAUDI_USE_INTELAMPLIFIER ON CACHE BOOL "")
set(GAUDI_USE_JEMALLOC ON CACHE BOOL "")
set(GAUDI_ENABLE_GAUDIALG OFF CACHE BOOL "")
set(GAUDI_ENABLE_GAUDIPARTPROP ON CACHE BOOL "")
set(BUILD_TESTING ON CACHE BOOL "")
......@@ -10,4 +10,5 @@ set(GAUDI_USE_DOXYGEN ON CACHE BOOL "")
set(GAUDI_USE_INTELAMPLIFIER ON CACHE BOOL "")
set(GAUDI_USE_JEMALLOC ON CACHE BOOL "")
set(GAUDI_ENABLE_GAUDIALG OFF CACHE BOOL "")
set(GAUDI_ENABLE_GAUDIPARTPROP ON CACHE BOOL "")
set(BUILD_TESTING ON CACHE BOOL "")
......@@ -10,4 +10,5 @@
# set(GAUDI_USE_INTELAMPLIFIER OFF CACHE BOOL "")
# set(GAUDI_USE_JEMALLOC ON CACHE BOOL "")
# set(GAUDI_ENABLE_GAUDIALG OFF CACHE BOOL "")
# set(GAUDI_ENABLE_GAUDIPARTPROP ON CACHE BOOL "")
set(BUILD_TESTING OFF CACHE BOOL "")
......@@ -139,6 +139,7 @@ endif()
set(gperftools_pkgconfig_module "libprofiler>=2.7.0")
option(GAUDI_ENABLE_GAUDIALG "Build the subdirectory GaudiAlg" NO)
option(GAUDI_ENABLE_GAUDIPARTPROP "Build the subdirectory GaudiPartProp" YES)
foreach(dep IN LISTS deps)
string(TOUPPER ${dep} DEP)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment