From 52121115e8133021ea1ff919fb3169eb2af96a02 Mon Sep 17 00:00:00 2001
From: Frank Gaede <frank.gaede@desy.de>
Date: Mon, 17 Nov 2014 12:20:15 +0000
Subject: [PATCH] - moved ddsim.cpp (dd_sim binary) to DDG4
---
DDG4/CMakeLists.txt | 5 ++++-
{UtilityApps/src => DDG4}/ddsim.cpp | 0
UtilityApps/CMakeLists.txt | 10 ----------
3 files changed, 4 insertions(+), 11 deletions(-)
rename {UtilityApps/src => DDG4}/ddsim.cpp (100%)
diff --git a/DDG4/CMakeLists.txt b/DDG4/CMakeLists.txt
index 78b7a760f..3fea704f9 100644
--- a/DDG4/CMakeLists.txt
+++ b/DDG4/CMakeLists.txt
@@ -58,6 +58,9 @@ target_link_libraries(g4gdmlDisplay DD4hepG4 DD4hepCore)
#-----------------------------------------------------------------------------------
add_executable(g4FromXML g4FromXML.cpp)
target_link_libraries(g4FromXML DD4hepG4 DD4hepCore)
+#-----------------------------------------------------------------------------------
+add_executable( dd_sim ddsim.cpp)
+target_link_libraries(dd_sim DD4hepCore DD4hepG4)
#--- install target-------------------------------------
install(DIRECTORY include/DDG4
@@ -75,7 +78,7 @@ install(FILES
python/SystemOfUnits.py
DESTINATION python)
-install(TARGETS DD4hepG4 DD4hepG4Plugins DD4hepG4Legacy g4gdmlDisplay
+install(TARGETS DD4hepG4 DD4hepG4Plugins DD4hepG4Legacy g4gdmlDisplay dd_sim
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
)
diff --git a/UtilityApps/src/ddsim.cpp b/DDG4/ddsim.cpp
similarity index 100%
rename from UtilityApps/src/ddsim.cpp
rename to DDG4/ddsim.cpp
diff --git a/UtilityApps/CMakeLists.txt b/UtilityApps/CMakeLists.txt
index 59ce2f29b..510e25476 100644
--- a/UtilityApps/CMakeLists.txt
+++ b/UtilityApps/CMakeLists.txt
@@ -22,16 +22,6 @@ add_executable( print_materials src/print_materials.cpp)
target_link_libraries(print_materials DD4hepCore DD4hepRec)
#-----------------------------------------------------------------------------------
-if(DD4HEP_USE_GEANT4)
- include_directories( ${CMAKE_SOURCE_DIR}/DDG4/include )
-
- add_executable( dd_sim src/ddsim.cpp)
- target_link_libraries(dd_sim DD4hepCore DD4hepG4)
- install(TARGETS dd_sim RUNTIME DESTINATION bin )
-endif()
-#-----------------------------------------------------------------------------------
-
-
root_generate_dictionary( G__teve src/EvNavHandler.h LINKDEF src/LinkDef.h)
if(DD4HEP_USE_LCIO)
--
GitLab