diff --git a/CMakeLists.txt b/CMakeLists.txt index b891580e1b29fa415e86f402f9cf8bbdd7c13b25..512b5e13a9434b6059b547bb6a8ce06c6dc33d35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,7 +116,6 @@ if( DEFINED DD4HEP_WITH_GEANT4 OR DEFINED DD4HEP_WITH_GEAR ) endif() include(DD4hep_XML_setup) -add_subdirectory(DDSegmentation) add_subdirectory(DDParsers) add_subdirectory(DDCore) add_subdirectory(DDRec) diff --git a/DDSegmentation/CMakeLists.txt b/DDSegmentation/CMakeLists.txt deleted file mode 100644 index 585d770e802e786812a5fcf5902474dd73abc866..0000000000000000000000000000000000000000 --- a/DDSegmentation/CMakeLists.txt +++ /dev/null @@ -1,46 +0,0 @@ -cmake_minimum_required(VERSION 3.3 FATAL_ERROR) -project(DDSegmentation) - #fg: version number must be the same as dd4hep !! -set(DDSegmentation_VERSION_MAJOR 1) -set(DDSegmentation_VERSION_MINOR 6) -set(DDSegmentation_VERSION_PATCH 0) -set(DDSegmentation_VERSION "${DDSegmentation_VERSION_MAJOR}.${DDSegmentation_VERSION_MINOR}" ) -set(DDSegmentation_SOVERSION "${DDSegmentation_VERSION_MAJOR}.${DDSegmentation_VERSION_MINOR}") - -#------------- set the default installation directory to be the source directory - -IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - SET( CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR} CACHE PATH - "install prefix path - overwrite with -D CMAKE_INSTALL_PREFIX = ..." - FORCE ) - MESSAGE(STATUS "CMAKE_INSTALL_PREFIX is ${CMAKE_INSTALL_PREFIX} - overwrite with -D CMAKE_INSTALL_PREFIX" ) -ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/include ) - -file(GLOB sources src/*.cpp) - -add_library(DDSegmentation SHARED ${sources}) - -SET_TARGET_PROPERTIES( DDSegmentation PROPERTIES VERSION ${DDSegmentation_VERSION} SOVERSION ${DDSegmentation_SOVERSION}) - -#if DDSegmentation is build as part of dd4hep -if( NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) - SET ( DDSegmentation_LIBRARIES DDSegmentation PARENT_SCOPE ) - SET ( DDSEGMENTATION_LIBRARIES DDSegmentation PARENT_SCOPE ) -endif() - -install(TARGETS DDSegmentation - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ) -# to do: add corresponding uninstall... -#------------------------------------------------------- - -# Export the package for use from the build-tree -# (this registers the build-tree with a global CMake-registry) -#export(PACKAGE DDSegmentation) - -# Create the DDSegmentationConfig.cmake and DDSegmentationConfigVersion files -configure_file(cmake/DDSegmentationConfig.cmake.in ${CMAKE_INSTALL_PREFIX}/DDSegmentationConfig.cmake) - diff --git a/DDSegmentation/cmake/DDSegmentationConfig.cmake.in b/DDSegmentation/cmake/DDSegmentationConfig.cmake.in deleted file mode 100644 index 38756f07c233f40de192b60790c226ab5464c739..0000000000000000000000000000000000000000 --- a/DDSegmentation/cmake/DDSegmentationConfig.cmake.in +++ /dev/null @@ -1,35 +0,0 @@ -############################################################################## -# cmake configuration file for DDSegmentation -# -# returns following variables: -# -# DDSegmentation_FOUND : set to TRUE if DDSegmentation found -# DDSegmentation_VERSION : package version -# DDSegmentation_ROOT : path to this DDSegmentation installation -# DDSegmentation_LIBRARIES : list of dd4hep libraries -# DDSegmentation_INCLUDE_DIRS : list of paths to be used with INCLUDE_DIRECTORIES -# DDSegmentation_LIBRARY_DIR : list of paths to be used with LINK_DIRECTORIES -# -# @author Christian Grefe, CERN -############################################################################## - -SET( DDSegmentation_ROOT "@CMAKE_INSTALL_PREFIX@" ) -SET( DDSegmentation_VERSION "@DDSegmentation_VERSION@" ) - -# ---------- libraries -------------------------------------------------------- -# do not store find results in cache -SET( DDSegmentation_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include" ) - - -# Find the DDSegmentation libraries -find_library(DDSegmentation_LIBRARIES - NAMES DDSegmentation - PATHS "@CMAKE_INSTALL_PREFIX@/lib" -) - -MARK_AS_ADVANCED( DDSegmentation_INCLUDE_DIRS DDSegmentation_LIBRARY_DIRS DDSegmentation_LIBRARIES ) - -INCLUDE( FindPackageHandleStandardArgs ) -# set DDSegmentation_FOUND to TRUE if all listed variables are TRUE and not empty -FIND_PACKAGE_HANDLE_STANDARD_ARGS( DDSegmentation DEFAULT_MSG DDSegmentation_ROOT DDSegmentation_INCLUDE_DIRS DDSegmentation_LIBRARIES ) - diff --git a/DDSegmentation/src/bla.cpp b/DDSegmentation/src/bla.cpp deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000