From efedcb7f7eed2e3c3c882b03f19d740a278cebdb Mon Sep 17 00:00:00 2001 From: lintao <lintao51@gmail.com> Date: Wed, 23 Dec 2020 09:38:32 +0800 Subject: [PATCH] Migrate KalTest. Add the missing config cmake. --- Utilities/CMakeLists.txt | 2 +- Utilities/KalTest/CMakeLists.txt | 18 ++++++++++-------- cmake/CEPCSWConfig.cmake | 13 +++++++++++++ 3 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 cmake/CEPCSWConfig.cmake diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt index 3c3a838c..0fbf58c2 100644 --- a/Utilities/CMakeLists.txt +++ b/Utilities/CMakeLists.txt @@ -1,5 +1,5 @@ add_subdirectory(DataHelper) # add_subdirectory(KalDet) -# add_subdirectory(KalTest) +add_subdirectory(KalTest) # add_subdirectory(KiTrack) diff --git a/Utilities/KalTest/CMakeLists.txt b/Utilities/KalTest/CMakeLists.txt index 1b20a31d..9adae9dc 100644 --- a/Utilities/KalTest/CMakeLists.txt +++ b/Utilities/KalTest/CMakeLists.txt @@ -3,15 +3,11 @@ # Desc: import from ILCSoft ############################################################################## -gaudi_subdir(KalTest v0r0) - find_package(ROOT REQUIRED COMPONENTS MathCore) -gaudi_depends_on_subdirs() - set( DICT_CINT_DEFINITIONS "HANDLE_DICT_EXCEPTIONS=IGNORED_FOR_CINT" ) set( DICT_INPUT_DIRS geomlib kallib kaltracklib utils ) -set( DICT_OUTPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/rootdict ) +set( DICT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/rootdict ) foreach( DICT ${DICT_INPUT_DIRS} ) list( APPEND DICT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src/${DICT} ) @@ -54,7 +50,13 @@ include_directories( ${ROOT_INCLUDE_DIRS} ) set(KalTestLib_srcs ${LIB_SOURCES}) -gaudi_add_library(KalTestLib ${KalTestLib_srcs} - PUBLIC_HEADERS kaltest - LINK_LIBRARIES GaudiKernel ROOT +gaudi_add_library(KalTestLib + SOURCES ${KalTestLib_srcs} + LINK Gaudi::GaudiKernel + ${ROOT_LIBRARIES} ) +install(TARGETS KalTestLib + EXPORT CEPCSWTargets + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib + COMPONENT dev) diff --git a/cmake/CEPCSWConfig.cmake b/cmake/CEPCSWConfig.cmake new file mode 100644 index 00000000..4f9445ac --- /dev/null +++ b/cmake/CEPCSWConfig.cmake @@ -0,0 +1,13 @@ +include(CMakeFindDependencyMacro) +find_dependency(podio REQUIRED) +find_dependency(Gaudi REQUIRED) +find_dependency(k4FWCore REQUIRED) +find_dependency(EDM4HEP REQUIRED) +find_dependency(ROOT REQUIRED) + +# - Include the targets file to create the imported targets that a client can +# link to (libraries) or execute (programs) +include("${CMAKE_CURRENT_LIST_DIR}/CEPCSWTargets.cmake") + +get_property(TEST_CEPCSW_LIBRARY TARGET CEPCSW::GeomSvc PROPERTY LOCATION) +find_package_handle_standard_args(CEPCSW DEFAULT_MSG CMAKE_CURRENT_LIST_FILE TEST_CEPCSW_LIBRARY) -- GitLab