Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
CEPCSW
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package 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
Li Zhihao
CEPCSW
Commits
7899b6d5
Commit
7899b6d5
authored
4 years ago
by
lintao@ihep.ac.cn
Browse files
Options
Downloads
Patches
Plain Diff
WIP: remove the plcio from the dependencies.
parent
a1036c3b
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Generator/CMakeLists.txt
+1
-18
1 addition, 18 deletions
Generator/CMakeLists.txt
Simulation/DetSimAna/CMakeLists.txt
+2
-5
2 additions, 5 deletions
Simulation/DetSimAna/CMakeLists.txt
Simulation/DetSimCore/CMakeLists.txt
+1
-3
1 addition, 3 deletions
Simulation/DetSimCore/CMakeLists.txt
with
4 additions
and
26 deletions
Generator/CMakeLists.txt
+
1
−
18
View file @
7899b6d5
...
@@ -21,7 +21,6 @@ include(${Geant4_USE_FILE})
...
@@ -21,7 +21,6 @@ include(${Geant4_USE_FILE})
find_package
(
ROOT COMPONENTS RIO Tree TreePlayer MathCore Net Graf3d Graf Gpad EG REQUIRED
)
find_package
(
ROOT COMPONENTS RIO Tree TreePlayer MathCore Net Graf3d Graf Gpad EG REQUIRED
)
find_package
(
LCIO
)
find_package
(
LCIO
)
find_package
(
podio
)
find_package
(
podio
)
find_package
(
plcio
)
find_package
(
EDM4HEP
)
find_package
(
EDM4HEP
)
find_package
(
HepMC
)
find_package
(
HepMC
)
find_package
(
CLHEP
)
find_package
(
CLHEP
)
...
@@ -34,9 +33,6 @@ endif(LCIO_FOUND)
...
@@ -34,9 +33,6 @@ endif(LCIO_FOUND)
if
(
podio_FOUND
)
if
(
podio_FOUND
)
message
(
"found podio:
${
podio_INCLUDE_DIRS
}
${
podio_LIBRARIES
}
"
)
message
(
"found podio:
${
podio_INCLUDE_DIRS
}
${
podio_LIBRARIES
}
"
)
endif
(
podio_FOUND
)
endif
(
podio_FOUND
)
if
(
plcio_FOUND
)
message
(
"found plcio:
${
plcio_INCLUDE_DIRS
}
${
plcio_LIBRARY_DIR
}
"
)
endif
(
plcio_FOUND
)
if
(
HepMC_FOUND
)
if
(
HepMC_FOUND
)
message
(
"found HepMC:
${
HepMC_INCLUDE_DIRS
}
${
HepMC_LIBRARY_DIR
}
"
)
message
(
"found HepMC:
${
HepMC_INCLUDE_DIRS
}
${
HepMC_LIBRARY_DIR
}
"
)
endif
(
HepMC_FOUND
)
endif
(
HepMC_FOUND
)
...
@@ -48,26 +44,13 @@ INCLUDE_DIRECTORIES(${GenAlgo_incs})
...
@@ -48,26 +44,13 @@ INCLUDE_DIRECTORIES(${GenAlgo_incs})
gaudi_add_module
(
GenAlgo
${
GenAlgo_srcs
}
gaudi_add_module
(
GenAlgo
${
GenAlgo_srcs
}
INCLUDE_DIRS
INCLUDE_DIRS
# GaudiKernel
FWCore
FWCore
# Geant4
# ${LCIO_INCLUDE_DIRS}
# ${podio_INCLUDE_DIRS}
# ${plcio_INCLUDE_DIRS}
# ${ROOT_INCLUDE_DIRS}
# HepMC
LINK_LIBRARIES
LINK_LIBRARIES
# GaudiKernel
# ${LCIO_LIBRARIES}
# ${podio_LIBRARIES}
ROOT
ROOT
# ${plcio_LIBRARY_DIR}/libplcio.so
# ${plcio_LIBRARY_DIR}/libplcioDict.so
FWCore
FWCore
HepMC
HepMC
CLHEP
CLHEP
# Geant4
EDM4HEP::edm4hep EDM4HEP::edm4hepDict
EDM4HEP::edm4hep
)
)
#gaudi_add_test(Reader FRAMEWORK options/read.py)
#gaudi_add_test(Reader FRAMEWORK options/read.py)
...
...
This diff is collapsed.
Click to expand it.
Simulation/DetSimAna/CMakeLists.txt
+
2
−
5
View file @
7899b6d5
...
@@ -12,16 +12,14 @@ find_package(DD4hep COMPONENTS DDG4 REQUIRED)
...
@@ -12,16 +12,14 @@ find_package(DD4hep COMPONENTS DDG4 REQUIRED)
# For EDM & I/O
# For EDM & I/O
find_package
(
podio REQUIRED
)
find_package
(
podio REQUIRED
)
find_package
(
plcio REQUIRED
)
find_package
(
EDM4HEP REQUIRED
)
find_package
(
EDM4HEP REQUIRED
)
# find_package(LCIO REQUIRED)
# find_package(LCIO REQUIRED)
set
(
DetSimAna_srcs
set
(
DetSimAna_srcs
src/ExampleAnaElemTool.cpp
#
src/ExampleAnaElemTool.cpp
src/Edm4hepWriterAnaElemTool.cpp
src/Edm4hepWriterAnaElemTool.cpp
)
)
message
(
"podio_LIBRARIES:
${
podio_LIBRARIES
}
"
)
message
(
"podio_LIBRARIES:
${
podio_LIBRARIES
}
"
)
message
(
"plcio_LIBRARIES:
${
plcio_LIBRARIES
}
"
)
gaudi_add_module
(
DetSimAna
${
DetSimAna_srcs
}
gaudi_add_module
(
DetSimAna
${
DetSimAna_srcs
}
INCLUDE_DIRS
INCLUDE_DIRS
# DetSimInterface
# DetSimInterface
...
@@ -38,7 +36,6 @@ gaudi_add_module(DetSimAna ${DetSimAna_srcs}
...
@@ -38,7 +36,6 @@ gaudi_add_module(DetSimAna ${DetSimAna_srcs}
${
DD4hep_COMPONENT_LIBRARIES
}
${
DD4hep_COMPONENT_LIBRARIES
}
GaudiKernel
GaudiKernel
# Geant4
# Geant4
${
plcio_LIBRARIES
}
EDM4HEP::edm4hep EDM4HEP::edm4hepDict
EDM4HEP::edm4hep
# ${podio_LIBRARIES}
# ${podio_LIBRARIES}
)
)
This diff is collapsed.
Click to expand it.
Simulation/DetSimCore/CMakeLists.txt
+
1
−
3
View file @
7899b6d5
...
@@ -9,7 +9,6 @@ gaudi_depends_on_subdirs(
...
@@ -9,7 +9,6 @@ gaudi_depends_on_subdirs(
find_package
(
Geant4 REQUIRED ui_all vis_all
)
find_package
(
Geant4 REQUIRED ui_all vis_all
)
include
(
${
Geant4_USE_FILE
}
)
include
(
${
Geant4_USE_FILE
}
)
find_package
(
podio REQUIRED
)
find_package
(
podio REQUIRED
)
find_package
(
plcio REQUIRED
)
find_package
(
EDM4HEP REQUIRED
)
find_package
(
EDM4HEP REQUIRED
)
find_package
(
DD4hep COMPONENTS DDG4 REQUIRED
)
find_package
(
DD4hep COMPONENTS DDG4 REQUIRED
)
...
@@ -40,7 +39,6 @@ gaudi_add_module(DetSimCore ${DetSimCore_srcs}
...
@@ -40,7 +39,6 @@ gaudi_add_module(DetSimCore ${DetSimCore_srcs}
# Geant4
# Geant4
# ${Geant4_LIBRARIES}
# ${Geant4_LIBRARIES}
DD4hep
${
DD4hep_COMPONENT_LIBRARIES
}
DD4hep
${
DD4hep_COMPONENT_LIBRARIES
}
plcio
EDM4HEP::edm4hep EDM4HEP::edm4hepDict
EDM4HEP::edm4hep
# podio
# podio
)
)
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