Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
NPDet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
Chao Peng
NPDet
Commits
9f93c0e9
Commit
9f93c0e9
authored
4 years ago
by
Whitney Armstrong
Browse files
Options
Downloads
Plain Diff
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
4 years ago
Stage: build
Stage: container
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/ConceptDetectors/topside/CMakeLists.txt
+2
-2
2 additions, 2 deletions
src/ConceptDetectors/topside/CMakeLists.txt
src/GenericDetectors/CMakeLists.txt
+4
-4
4 additions, 4 deletions
src/GenericDetectors/CMakeLists.txt
with
6 additions
and
6 deletions
src/ConceptDetectors/topside/CMakeLists.txt
+
2
−
2
View file @
9f93c0e9
...
@@ -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
DD4hep
Plugin
)
find_package
(
Acts REQUIRED COMPONENTS Core
Plugin
Identification
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 Acts
DD4hep
Plugin
USES ActsCore ActsPlugin
DD4hep
)
)
target_link_libraries
(
${
a_lib_name
}
target_link_libraries
(
${
a_lib_name
}
PUBLIC DD4hep::DDCore DD4hep::DDRec
PUBLIC DD4hep::DDCore DD4hep::DDRec
...
...
This diff is collapsed.
Click to expand it.
src/GenericDetectors/CMakeLists.txt
+
4
−
4
View file @
9f93c0e9
...
@@ -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
DD4hep
Plugin
)
find_package
(
Acts REQUIRED COMPONENTS Core
Plugin
Identification
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 Acts
DD4hep
Plugin
USES ActsCore ActsPlugin
DD4hep
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 Acts
DD4hep
Plugin
PUBLIC ActsPlugin
DD4hep
PUBLIC Acts
TGeo
Plugin
PUBLIC ActsPlugin
TGeo
)
)
#target_include_directories(GenDetectors
#target_include_directories(GenDetectors
# PUBLIC beamline/include
# PUBLIC beamline/include
...
...
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