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
c3d85233
Commit
c3d85233
authored
5 years ago
by
Andre Sailer
Browse files
Options
Downloads
Patches
Plain Diff
Remove use of GEANT4_INCLUDE_DIRS, use target library instead
parent
377272ac
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
DDG4/CMakeLists.txt
+2
-6
2 additions, 6 deletions
DDG4/CMakeLists.txt
cmake/FindPYTHON.cmake
+0
-15
0 additions, 15 deletions
cmake/FindPYTHON.cmake
with
2 additions
and
21 deletions
DDG4/CMakeLists.txt
+
2
−
6
View file @
c3d85233
...
@@ -51,9 +51,7 @@ new_dd4hep_add_plugin(DDG4Legacy SOURCES legacy/*.cpp
...
@@ -51,9 +51,7 @@ new_dd4hep_add_plugin(DDG4Legacy SOURCES legacy/*.cpp
#-----------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------
new_dd4hep_add_dictionary
(
G__DDG4
new_dd4hep_add_dictionary
(
G__DDG4
SOURCES python/DDG4Dict.C
SOURCES python/DDG4Dict.C
DEPENDS DDCore DDParsers DDG4
DEPENDS DDCore DDParsers DDG4 Geant4::Interface
INCLUDES
${
Geant4_INCLUDE_DIRS
}
DEFINITIONS
${
Geant4_DEFINITIONS
}
)
)
#--------------------------- Plugin library for the simulation framework ---------
#--------------------------- Plugin library for the simulation framework ---------
new_dd4hep_add_plugin
(
DDG4Plugins
new_dd4hep_add_plugin
(
DDG4Plugins
...
@@ -68,9 +66,7 @@ if(PYTHONLIBS_FOUND)
...
@@ -68,9 +66,7 @@ if(PYTHONLIBS_FOUND)
MESSAGE
(
STATUS
"Python found, creating DDG4Python Dictionary"
)
MESSAGE
(
STATUS
"Python found, creating DDG4Python Dictionary"
)
new_dd4hep_add_dictionary
(
G__DDG4Python
new_dd4hep_add_dictionary
(
G__DDG4Python
SOURCES src/python/DDG4Python.C
SOURCES src/python/DDG4Python.C
DEPENDS DDCore DDParsers DDG4 ROOT::Core
DEPENDS DDCore DDParsers DDG4 ROOT::Core Geant4::Interface
INCLUDES
${
Geant4_INCLUDE_DIRS
}
${
PYTHON_INCLUDE_DIRS
}
DEFINITIONS
${
Geant4_DEFINITIONS
}
)
)
new_dd4hep_add_dictionary
(
G__DDPython
new_dd4hep_add_dictionary
(
G__DDPython
SOURCES tpython/DDPython.C
SOURCES tpython/DDPython.C
...
...
This diff is collapsed.
Click to expand it.
cmake/FindPYTHON.cmake
deleted
100644 → 0
+
0
−
15
View file @
377272ac
include
(
FindPackageHandleStandardArgs
)
find_package
(
PythonInterp 2 REQUIRED
)
find_package
(
PythonLibs 2 REQUIRED
)
if
(
PYTHONLIBS_FOUND
)
get_filename_component
(
PYTHON_LIBRARY_DIR
${
PYTHON_LIBRARIES
}
PATH
)
set
(
PYTHON_LIBRARY_DIR
${
PYTHON_LIBRARY_DIR
}
)
set
(
PYTHON_LIBRARIES
${
PYTHON_LIBRARIES
}
)
set
(
PYTHON_INCLUDE_DIRS
${
PYTHON_INCLUDE_DIRS
}
)
else
()
message
(
STATUS
"PYTHON ****NOT**** FOUND"
)
endif
()
find_package_handle_standard_args
(
PYTHON DEFAULT_MSG PYTHON_INCLUDE_DIR
)
mark_as_advanced
(
PYTHON_FOUND PYTHON_INCLUDE_DIRS
)
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