From d47457a28bc9ca854f5ffbf7a69fad9bae2022a3 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Fri, 8 May 2015 14:30:38 +0000
Subject: [PATCH] Rename library DD4hepCore --> DDCore
---
DDAlign/CMakeLists.txt | 2 +-
DDCond/CMakeLists.txt | 2 +-
DDCore/CMakeLists.txt | 15 +++++++--------
DDDetectors/CMakeLists.txt | 2 +-
DDEve/CMakeLists.txt | 2 +-
DDG4/CMakeLists.txt | 14 +++++++-------
DDRec/CMakeLists.txt | 2 +-
DDTest/CMakeLists.txt | 4 ++--
UtilityApps/CMakeLists.txt | 16 ++++++++--------
cmake/DD4hepConfig.cmake.in | 4 ++--
10 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/DDAlign/CMakeLists.txt b/DDAlign/CMakeLists.txt
index cd9365d59..febd0271d 100644
--- a/DDAlign/CMakeLists.txt
+++ b/DDAlign/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(${CMAKE_SOURCE_DIR}/DDCore/include
#---DD4hepAlign library --------------------------------------------------------------
file(GLOB sources src/*.cpp)
add_library(DD4hepAlign SHARED ${sources})
-target_link_libraries(DD4hepAlign DD4hepCore ${ROOT_LIBRARIES})
+target_link_libraries(DD4hepAlign DDCore ${ROOT_LIBRARIES})
#
#
if(DD4HEP_USE_XERCESC)
diff --git a/DDCond/CMakeLists.txt b/DDCond/CMakeLists.txt
index 090c89d68..d82727867 100644
--- a/DDCond/CMakeLists.txt
+++ b/DDCond/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories(${CMAKE_SOURCE_DIR}/DDCore/include
#---DD4hepCond library --------------------------------------------------------------
file(GLOB sources src/*.cpp)
add_library(DD4hepCond SHARED ${sources})
-target_link_libraries(DD4hepCond DD4hepCore ${ROOT_LIBRARIES})
+target_link_libraries(DD4hepCond DDCore ${ROOT_LIBRARIES})
if(DD4HEP_USE_XERCESC)
add_definitions(-DDD4HEP_USE_XERCESC)
diff --git a/DDCore/CMakeLists.txt b/DDCore/CMakeLists.txt
index 1deef8d2c..040e28024 100644
--- a/DDCore/CMakeLists.txt
+++ b/DDCore/CMakeLists.txt
@@ -2,8 +2,7 @@ cmake_minimum_required(VERSION 2.8.3 FATAL_ERROR)
project(DDCore)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${ROOT_INCLUDE_DIR} ${DDSegmentation_INCLUDE_DIRS} )
-
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${DDSegmentation_INCLUDE_DIRS})
file(GLOB sources src/*.cpp src/Evaluator/*.cpp src/XML/*.cpp)
file(GLOB plugin_sources src/plugins/*.cpp)
@@ -13,7 +12,7 @@ if(DD4HEP_USE_BOOST)
file(GLOB parser_sources src/parsers/*.cpp )
add_definitions(-DDD4HEP_USE_BOOST)
else()
- file(GLOB parser_sources )
+ file(GLOB parser_sources)
endif()
file(GLOB headers include/DD4hep/*.h)
@@ -37,22 +36,22 @@ if(NOT DD4HEP_NO_REFLEX)
set(libraries ${libraries} Reflex)
endif()
-add_library(DD4hepCore SHARED ${sources} ${parser_sources} )
+add_library(DDCore SHARED ${sources} ${parser_sources} )
-target_link_libraries(DD4hepCore ${ROOT_LIBRARIES} ${XML_LIBRARIES} ${DDSegmentation_LIBRARIES} Geom ${libraries})
+target_link_libraries(DDCore ${ROOT_LIBRARIES} ${XML_LIBRARIES} ${DDSegmentation_LIBRARIES} Geom ${libraries})
## generates rootmap and installs the library
add_dd4hep_plugin(DD4hepPlugins SHARED ${plugin_sources})
-target_link_libraries(DD4hepPlugins ${ROOT_LIBRARIES} ${XML_LIBRARIES} DD4hepCore Geom ${libraries})
+target_link_libraries(DD4hepPlugins ${ROOT_LIBRARIES} ${XML_LIBRARIES} DDCore Geom ${libraries})
-SET_TARGET_PROPERTIES( DD4hepCore DD4hepPlugins PROPERTIES VERSION ${DD4hep_VERSION} SOVERSION ${DD4hep_SOVERSION})
+SET_TARGET_PROPERTIES( DDCore DD4hepPlugins PROPERTIES VERSION ${DD4hep_VERSION} SOVERSION ${DD4hep_SOVERSION})
#--- install target-------------------------------------
install(DIRECTORY include/DD4hep include/XML
DESTINATION include
PATTERN ".svn" EXCLUDE )
-install(TARGETS DD4hepCore
+install(TARGETS DDCore
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
)
diff --git a/DDDetectors/CMakeLists.txt b/DDDetectors/CMakeLists.txt
index fd4231d78..e60ea5e1c 100644
--- a/DDDetectors/CMakeLists.txt
+++ b/DDDetectors/CMakeLists.txt
@@ -23,7 +23,7 @@ include_directories(${CMAKE_SOURCE_DIR}/DDCore/include
file(GLOB sources src/*.cpp )
add_library( DD4hepDetectors SHARED ${sources})
-target_link_libraries( DD4hepDetectors DD4hepCore DDRec ${ROOT_LIBRARIES} )
+target_link_libraries( DD4hepDetectors DDCore DDRec ${ROOT_LIBRARIES} )
#
#---Rootmap generation--------------------------------------------------------------
dd4hep_generate_rootmap( DD4hepDetectors )
diff --git a/DDEve/CMakeLists.txt b/DDEve/CMakeLists.txt
index e57a2913b..b06b72556 100644
--- a/DDEve/CMakeLists.txt
+++ b/DDEve/CMakeLists.txt
@@ -28,7 +28,7 @@ endif()
#---DD4hepEve library --------------------------------------------------------------
file(GLOB headers include/DDEve/*.h)
file(GLOB sources src/*.cpp)
-set( eve_link_libraries DD4hepCore ${ROOT_EVE_LIBRARIES} -lFTGL )
+set( eve_link_libraries DDCore ${ROOT_EVE_LIBRARIES} -lFTGL )
#--------------------------- Support for the LCIO data I/O ------------------------
if(DD4HEP_USE_LCIO)
find_package(LCIO REQUIRED)
diff --git a/DDG4/CMakeLists.txt b/DDG4/CMakeLists.txt
index 3b42c86ab..cae53dbc1 100644
--- a/DDG4/CMakeLists.txt
+++ b/DDG4/CMakeLists.txt
@@ -19,14 +19,14 @@ if(NOT DD4HEP_USE_XERCESC)
endif()
#
add_library(DD4hepG4 SHARED ${sources})
-target_link_libraries(DD4hepG4 DD4hepCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES})
+target_link_libraries(DD4hepG4 DDCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES})
SET_TARGET_PROPERTIES( DD4hepG4 PROPERTIES VERSION ${DD4hep_VERSION} SOVERSION ${DD4hep_SOVERSION})
#-----------------------------------------------------------------------------------
# No rootmap for link libraries!
#--------------------------- Legacy libraries (for Frank) -------------------------
file(GLOB legacy_sources legacy/*.cpp)
add_library(DD4hepG4Legacy SHARED ${legacy_sources})
-target_link_libraries(DD4hepG4Legacy DD4hepCore DD4hepG4 ${ROOT_LIBRARIES} ${Geant4_LIBRARIES})
+target_link_libraries(DD4hepG4Legacy DDCore DD4hepG4 ${ROOT_LIBRARIES} ${Geant4_LIBRARIES})
SET_TARGET_PROPERTIES(DD4hepG4Legacy PROPERTIES VERSION ${DD4hep_VERSION} SOVERSION ${DD4hep_SOVERSION})
dd4hep_generate_rootmap(DD4hepG4Legacy)
@@ -37,7 +37,7 @@ root_generate_dictionary( G__DDG4 ${CMAKE_CURRENT_SOURCE_DIR}/python/DDG4Dict.C
file(GLOB plugins_sources plugins/*.cpp)
list(APPEND plugins_sources G__DDG4.cxx)
add_library(DD4hepG4Plugins SHARED ${plugins_sources})
-target_link_libraries(DD4hepG4Plugins DD4hepCore DD4hepG4 ${ROOT_LIBRARIES} ${Geant4_LIBRARIES})
+target_link_libraries(DD4hepG4Plugins DDCore DD4hepG4 ${ROOT_LIBRARIES} ${Geant4_LIBRARIES})
SET_TARGET_PROPERTIES(DD4hepG4Plugins PROPERTIES VERSION ${DD4hep_VERSION} SOVERSION ${DD4hep_SOVERSION})
dd4hep_generate_rootmap(DD4hepG4Plugins)
@@ -48,20 +48,20 @@ if(DD4HEP_USE_LCIO)
include_directories( ${LCIO_INCLUDE_DIRS} )
file(GLOB lcio_sources lcio/*.cpp)
add_library(DD4hepG4LCIO SHARED ${lcio_sources})
- target_link_libraries(DD4hepG4LCIO DD4hepCore DD4hepG4 ${Geant4_LIBRARIES} ${LCIO_LIBRARIES} ${ROOT_LIBRARIES} EG)
+ target_link_libraries(DD4hepG4LCIO DDCore DD4hepG4 ${Geant4_LIBRARIES} ${LCIO_LIBRARIES} ${ROOT_LIBRARIES} EG)
SET_TARGET_PROPERTIES(DD4hepG4LCIO PROPERTIES VERSION ${DD4hep_VERSION} SOVERSION ${DD4hep_SOVERSION})
dd4hep_generate_rootmap(DD4hepG4LCIO)
endif()
#-----------------------------------------------------------------------------------
add_executable(g4gdmlDisplay g4gdmlDisplay.cpp)
-target_link_libraries(g4gdmlDisplay DD4hepG4 DD4hepCore)
+target_link_libraries(g4gdmlDisplay DD4hepG4 DDCore)
#-----------------------------------------------------------------------------------
add_executable(g4FromXML g4FromXML.cpp)
-target_link_libraries(g4FromXML DD4hepG4 DD4hepCore)
+target_link_libraries(g4FromXML DD4hepG4 DDCore)
#-----------------------------------------------------------------------------------
add_executable( dd_sim ddsim.cpp)
-target_link_libraries(dd_sim DD4hepCore DD4hepG4)
+target_link_libraries(dd_sim DDCore DD4hepG4)
#--- install target-------------------------------------
install(DIRECTORY include/DDG4
diff --git a/DDRec/CMakeLists.txt b/DDRec/CMakeLists.txt
index 3190337bd..e6a72ab95 100644
--- a/DDRec/CMakeLists.txt
+++ b/DDRec/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include
file(GLOB sources src/*.cpp)
-set(rec_link_libraries DD4hepCore ${DDSegmentation_LIBRARIES} ${ROOT_LIBRARIES} Geom Reflex)
+set(rec_link_libraries DDCore ${DDSegmentation_LIBRARIES} ${ROOT_LIBRARIES} Geom Reflex)
#--------------------------- GEAR wrappers for backward compatibility -----------
if(DD4HEP_USE_GEAR)
diff --git a/DDTest/CMakeLists.txt b/DDTest/CMakeLists.txt
index 39096aafc..28c9cbcb5 100644
--- a/DDTest/CMakeLists.txt
+++ b/DDTest/CMakeLists.txt
@@ -15,9 +15,9 @@ if(DD4HEP_USE_GEANT4)
endif()
if(DD4HEP_USE_GEANT4)
- link_libraries(DD4hepG4 DD4hepCore DDRec DDSegmentation ${ROOT_LIBRARIES} Reflex ${Geant4_LIBRARIES})
+ link_libraries(DD4hepG4 DDCore DDRec DDSegmentation ${ROOT_LIBRARIES} Reflex ${Geant4_LIBRARIES})
else()
- link_libraries(DD4hepCore DDRec DDSegmentation ${ROOT_LIBRARIES} Reflex ${Geant4_LIBRARIES})
+ link_libraries(DDCore DDRec DDSegmentation ${ROOT_LIBRARIES} Reflex ${Geant4_LIBRARIES})
endif()
#--------------------------------------------------
diff --git a/UtilityApps/CMakeLists.txt b/UtilityApps/CMakeLists.txt
index 790766db8..16d3e5a2e 100644
--- a/UtilityApps/CMakeLists.txt
+++ b/UtilityApps/CMakeLists.txt
@@ -9,22 +9,22 @@ include_directories( ${CMAKE_SOURCE_DIR}/DDCore/include
#-----------------------------------------------------------------------------------
add_executable(geoDisplay src/display.cpp)
-target_link_libraries(geoDisplay DD4hepCore )
+target_link_libraries(geoDisplay DDCore )
#-----------------------------------------------------------------------------------
add_executable(geoConverter src/converter.cpp)
-target_link_libraries(geoConverter DD4hepCore)
+target_link_libraries(geoConverter DDCore)
#-----------------------------------------------------------------------------------
add_executable(geoPluginRun src/plugin_runner.cpp)
-target_link_libraries(geoPluginRun DD4hepCore)
+target_link_libraries(geoPluginRun DDCore)
#-----------------------------------------------------------------------------------
add_executable( print_materials src/print_materials.cpp)
-target_link_libraries(print_materials DD4hepCore DDRec)
+target_link_libraries(print_materials DDCore DDRec)
#-----------------------------------------------------------------------------------
add_executable( materialScan src/materialScan.cpp)
-target_link_libraries(materialScan DD4hepCore DDRec)
+target_link_libraries(materialScan DDCore DDRec)
#-----------------------------------------------------------------------------------
add_executable( dumpdetector src/dumpdetector.cpp)
-target_link_libraries(dumpdetector DD4hepCore DDRec)
+target_link_libraries(dumpdetector DDCore DDRec)
#-----------------------------------------------------------------------------------
@@ -35,11 +35,11 @@ if(DD4HEP_USE_LCIO)
add_executable(teveDisplay src/teve_display.cpp G__teve.cxx src/next_event_lcio.cpp)
add_executable(test_surfaces src/test_surfaces.cpp )
- target_link_libraries(test_surfaces DD4hepCore DDRec ${LCIO_LIBRARIES} )
+ target_link_libraries(test_surfaces DDCore DDRec ${LCIO_LIBRARIES} )
else()
add_executable(teveDisplay src/teve_display.cpp G__teve.cxx src/next_event_dummy.cpp)
endif()
-target_link_libraries( teveDisplay DD4hepCore ${ROOT_EVE_LIBRARIES} DDRec ${LCIO_LIBRARIES} )
+target_link_libraries( teveDisplay DDCore ${ROOT_EVE_LIBRARIES} DDRec ${LCIO_LIBRARIES} )
#--- install target-------------------------------------
diff --git a/cmake/DD4hepConfig.cmake.in b/cmake/DD4hepConfig.cmake.in
index 03b21f05c..2979b81cb 100644
--- a/cmake/DD4hepConfig.cmake.in
+++ b/cmake/DD4hepConfig.cmake.in
@@ -50,7 +50,7 @@ INCLUDE( ${DD4hep_ROOT}/cmake/DD4hepMacros.cmake )
# additional components are set by cmake in variable PKG_FIND_COMPONENTS
# first argument should be the package name
if(@DD4HEP_USE_GEANT4@)
- CHECK_PACKAGE_LIBS(DD4hep DD4hepCore DDSegmentation DDRec DD4hepG4)
+ CHECK_PACKAGE_LIBS(DD4hep DDCore DDSegmentation DDRec DD4hepG4)
#--- if geant 4 was built with CLHEP we need to export this to client packages
if( @GEANT4_USE_CLHEP@)
@@ -60,7 +60,7 @@ if(@DD4HEP_USE_GEANT4@)
set( Geant4_DIR @Geant4_DIR@)
else()
- CHECK_PACKAGE_LIBS(DD4hep DD4hepCore DDSegmentation DDRec)
+ CHECK_PACKAGE_LIBS(DD4hep DDCore DDSegmentation DDRec)
endif()
--
GitLab