Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Jira
Code
Merge requests
168
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
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
atlas
athena
Merge requests
!32680
AFP_G4_SD+TrigEgammaAnalysisTools: cmake fixes
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
AFP_G4_SD+TrigEgammaAnalysisTools: cmake fixes
ssnyder/athena:cmake.AFP_G4_SD-20200506
into
master
Overview
5
Commits
2
Pipelines
1
Changes
2
Merged
Scott Snyder
requested to merge
ssnyder/athena:cmake.AFP_G4_SD-20200506
into
master
4 years ago
Overview
5
Commits
2
Pipelines
1
Changes
2
Expand
Don't build the same source into more than one library.
👍
0
👎
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
77347046
2 commits,
4 years ago
2 files
+
6
−
9
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
ForwardDetectors/AFP/AFP_G4_SD/CMakeLists.txt
+
4
−
6
Options
@@ -23,12 +23,6 @@ find_package( XercesC )
find_package
(
GTest
)
# Component(s) in the package:
atlas_add_component
(
AFP_G4_SD
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS
${
GEANT4_INCLUDE_DIRS
}
${
XERCESC_INCLUDE_DIRS
}
${
CLHEP_INCLUDE_DIRS
}
LINK_LIBRARIES
${
GEANT4_LIBRARIES
}
${
XERCESC_LIBRARIES
}
${
CLHEP_LIBRARIES
}
GaudiKernel StoreGateLib SGtests AFP_Geometry AFP_SimEv G4AtlasToolsLib
)
atlas_add_library
(
AFP_G4_SDLib
src/*.cxx
NO_PUBLIC_HEADERS AFP_G4_SD
@@ -36,6 +30,10 @@ atlas_add_library( AFP_G4_SDLib
LINK_LIBRARIES
${
GEANT4_LIBRARIES
}
${
XERCESC_LIBRARIES
}
${
CLHEP_LIBRARIES
}
GaudiKernel CxxUtils StoreGateLib SGtests AFP_Geometry AFP_SimEv G4AtlasToolsLib
)
atlas_add_component
(
AFP_G4_SD
src/components/*.cxx
LINK_LIBRARIES AFP_G4_SDLib
)
atlas_add_test
(
AFP_SensitiveDetector_gtest
SOURCES
test/AFP_SensitiveDetector_gtest.cxx
Loading