Skip to content
Snippets Groups Projects
Commit 9f93c0e9 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Merge branch 'acts_v1' into 'master'

Acts V1 changes

See merge request EIC/NPDet!144
parents ec811398 da1ac783
No related branches found
No related tags found
No related merge requests found
Pipeline #3976 failed
...@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.3 FATAL_ERROR) ...@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
#set(CMAKE_PREFIX_PATH $ENV{HOME}/lib CMAKE_PREFIX_PATH) #set(CMAKE_PREFIX_PATH $ENV{HOME}/lib CMAKE_PREFIX_PATH)
#find_package(Acts REQUIRED COMPONENTS Core IdentificationPlugin TGeoPlugin DD4hepPlugin PATHS /home/whit/lib/cmake NO_DEFAULT_PATH) #find_package(Acts REQUIRED COMPONENTS Core IdentificationPlugin TGeoPlugin DD4hepPlugin PATHS /home/whit/lib/cmake NO_DEFAULT_PATH)
find_package(Acts REQUIRED COMPONENTS Core IdentificationPlugin TGeoPlugin DD4hepPlugin ) find_package(Acts REQUIRED COMPONENTS Core PluginIdentification PluginTGeo PluginDD4hep )
#----------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------
set(a_lib_name topside) set(a_lib_name topside)
...@@ -15,7 +15,7 @@ dd4hep_configure_output() ...@@ -15,7 +15,7 @@ dd4hep_configure_output()
# ) # )
dd4hep_add_plugin(${a_lib_name} SOURCES src/*.cpp dd4hep_add_plugin(${a_lib_name} SOURCES src/*.cpp
USES ActsCore ActsDD4hepPlugin USES ActsCore ActsPluginDD4hep
) )
target_link_libraries(${a_lib_name} target_link_libraries(${a_lib_name}
PUBLIC DD4hep::DDCore DD4hep::DDRec PUBLIC DD4hep::DDCore DD4hep::DDRec
......
...@@ -12,7 +12,7 @@ dd4hep_configure_output() ...@@ -12,7 +12,7 @@ dd4hep_configure_output()
#set(CMAKE_PREFIX_PATH $ENV{HOME}/lib CMAKE_PREFIX_PATH) #set(CMAKE_PREFIX_PATH $ENV{HOME}/lib CMAKE_PREFIX_PATH)
#find_package(Acts REQUIRED COMPONENTS Core IdentificationPlugin TGeoPlugin DD4hepPlugin PATHS /home/whit/lib/cmake NO_DEFAULT_PATH) #find_package(Acts REQUIRED COMPONENTS Core IdentificationPlugin TGeoPlugin DD4hepPlugin PATHS /home/whit/lib/cmake NO_DEFAULT_PATH)
find_package(Acts REQUIRED COMPONENTS Core IdentificationPlugin TGeoPlugin DD4hepPlugin ) find_package(Acts REQUIRED COMPONENTS Core PluginIdentification PluginTGeo PluginDD4hep )
add_subdirectory(pid/sdet) add_subdirectory(pid/sdet)
...@@ -58,7 +58,7 @@ dd4hep_add_plugin(GenDetectors ...@@ -58,7 +58,7 @@ dd4hep_add_plugin(GenDetectors
pid/src/HexagonalScintPreShower_geo.cpp pid/src/HexagonalScintPreShower_geo.cpp
pid/src/ThresholdGasCherenkov_geo.cpp pid/src/ThresholdGasCherenkov_geo.cpp
pid/src/HeavyGasCherenkov_geo.cpp pid/src/HeavyGasCherenkov_geo.cpp
USES ActsCore ActsDD4hepPlugin USES ActsCore ActsPluginDD4hep
NOINSTALL NOINSTALL
) )
...@@ -66,8 +66,8 @@ target_link_libraries(GenDetectors ...@@ -66,8 +66,8 @@ target_link_libraries(GenDetectors
#PUBLIC DDG4_PIDsdet #PUBLIC DDG4_PIDsdet
PUBLIC DD4hep::DDCore DD4hep::DDRec PUBLIC DD4hep::DDCore DD4hep::DDRec
PUBLIC ActsCore PUBLIC ActsCore
PUBLIC ActsDD4hepPlugin PUBLIC ActsPluginDD4hep
PUBLIC ActsTGeoPlugin PUBLIC ActsPluginTGeo
) )
#target_include_directories(GenDetectors #target_include_directories(GenDetectors
# PUBLIC beamline/include # PUBLIC beamline/include
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment