Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DD4hep
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cepc
externals
mirroring
DD4hep
Commits
27bde9b3
Commit
27bde9b3
authored
7 years ago
by
Markus Frank
Committed by
MarkusFrankATcernch
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix compiler warnings (shadow and include-hygiene)
parent
c6e4ff07
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
DDCore/CMakeLists.txt
+2
-1
2 additions, 1 deletion
DDCore/CMakeLists.txt
DDEve/CMakeLists.txt
+2
-2
2 additions, 2 deletions
DDEve/CMakeLists.txt
DDG4/CMakeLists.txt
+4
-3
4 additions, 3 deletions
DDG4/CMakeLists.txt
with
8 additions
and
6 deletions
DDCore/CMakeLists.txt
+
2
−
1
View file @
27bde9b3
...
...
@@ -18,7 +18,8 @@ dd4hep_package( DDCore
#---Generate ROOT dictionary------------------------------------------------------
dd4hep_add_dictionary
(
G__DD4hep
SOURCES include/DD4hep/*.h
SOURCES include/ROOT/Warnings.h
include/DD4hep/*.h
include/DD4hep/detail/*.h
include/XML/*.h
${
DDSegmentation_INCLUDE_DIRS
}
/DDSegmentation/BitField64.h
...
...
This diff is collapsed.
Click to expand it.
DDEve/CMakeLists.txt
+
2
−
2
View file @
27bde9b3
...
...
@@ -15,7 +15,7 @@ dd4hep_package( DDEve
#
#---Add Plugin Library-----------------------------------------------------
dd4hep_add_dictionary
(
G__DDEve
SOURCES include/DDEve/*.h
SOURCES
${
DDCore_INCLUDE_DIRS
}
/include/ROOT/Warnings.h
include/DDEve/*.h
LINKDEF
${
DDCore_INCLUDE_DIRS
}
/include/ROOT/LinkDef.h
)
#
...
...
@@ -25,7 +25,7 @@ dd4hep_add_plugin ( DDEve SOURCES src/*.cpp
if
(
DD4HEP_USE_GEANT4
)
dd4hep_add_dictionary
(
G__DDG4IO
SOURCES DDEve/DDG4IO.C
SOURCES
${
DDCore_INCLUDE_DIRS
}
/include/ROOT/Warnings.h
DDEve/DDG4IO.C
LINKDEF
${
DDCore_INCLUDE_DIRS
}
/include/ROOT/LinkDef.h
OPTIONAL DDG4
)
...
...
This diff is collapsed.
Click to expand it.
DDG4/CMakeLists.txt
+
4
−
3
View file @
27bde9b3
...
...
@@ -20,7 +20,7 @@ dd4hep_add_package_library(DDG4 SOURCES src/*.cpp )
dd4hep_add_plugin
(
DDG4Legacy SOURCES legacy/*.cpp
)
#-----------------------------------------------------------------------------------
dd4hep_add_dictionary
(
G__DDG4
SOURCES python/DDG4Dict.C
SOURCES
${
DDCore_INCLUDE_DIRS
}
/include/ROOT/Warnings.h
python/DDG4Dict.C
LINKDEF
${
DDCore_INCLUDE_DIRS
}
/include/ROOT/LinkDef.h
)
#--------------------------- Plugin library for the simulation framework ---------
...
...
@@ -30,12 +30,13 @@ dd4hep_add_plugin(DDG4Plugins
)
#--------------------------- Plugin library for the simulation framework ---------
dd4hep_add_dictionary
(
G__DDG4Python
SOURCES src/python/DDG4Python.C
SOURCES
${
DDCore_INCLUDE_DIRS
}
/include/ROOT/Warnings.h
src/python/DDG4Python.C
LINKDEF
${
DDCore_INCLUDE_DIRS
}
/include/ROOT/LinkDef.h
OPTIONAL [PYTHON REQUIRED]
)
#--------------------------- Plugin library for the simulation framework ---------
dd4hep_add_dictionary
(
G__DDPython SOURCES tpython/DDPython.C
dd4hep_add_dictionary
(
G__DDPython
SOURCES
${
DDCore_INCLUDE_DIRS
}
/include/ROOT/Warnings.h tpython/DDPython.C
LINKDEF
${
DDCore_INCLUDE_DIRS
}
/include/ROOT/LinkDef.h
OPTIONAL [PYTHON REQUIRED]
)
...
...
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