From 843a2d69cffc5d0d3e6d31867f8237684c610efb Mon Sep 17 00:00:00 2001 From: Paolo Andreetto Date: Tue, 29 Sep 2020 15:23:08 +0200 Subject: [PATCH] Removed structures for Castor and muBlast --- CMakeLists.txt | 2 +- src/Root/CMakeLists.txt | 43 +++-------------------------------------- 2 files changed, 4 insertions(+), 41 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c4ac7eb..6916010 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ project(uLib) # The version number. set(PROJECT_VERSION_MAJOR 0) -set(PROJECT_VERSION_MINOR 3) +set(PROJECT_VERSION_MINOR 4) set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") set(PROJECT_SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") diff --git a/src/Root/CMakeLists.txt b/src/Root/CMakeLists.txt index 76fdab6..abc3085 100644 --- a/src/Root/CMakeLists.txt +++ b/src/Root/CMakeLists.txt @@ -1,49 +1,12 @@ -set(HEADERS TestTObject.h - RootMathDense.h +set(HEADERS RootMathDense.h RootMuonScatter.h - RootHitRaw.h - muBlastHit.h - muBlastMCTrack.h - muCastorMCTrack.h - muCastorHit.h - muCastorInfo.h) + RootHitRaw.h) -set(DICTIONARY_HEADERS TestTObject.h - RootMathDense.h - RootMuonScatter.h - RootHitRaw.h - muBlastHit.h - muBlastMCTrack.h - muCastorMCTrack.h - muCastorHit.h - muCastorInfo.h) - -set(SOURCES TestTObject.cpp - RootMuonScatter.cpp - muBlastHit.cpp - muBlastMCTrack.cpp - muCastorMCTrack.cpp - muCastorHit.cpp - muCastorInfo.cpp) +set(SOURCES ${HEADERS} RootMuonScatter.cpp) set(LIBRARIES ${ROOT_LIBRARIES} ${PACKAGE_LIBPREFIX}Math) -set(rDictName ${PACKAGE_LIBPREFIX}RootDict) -root_generate_dictionary(${rDictName} ${DICTIONARY_HEADERS} - LINKDEF Linkdef.h) -set_source_files_properties(${rDictName}.cxx - PROPERTIES GENERATED TRUE) -set_source_files_properties(${rDictName}.h - PROPERTIES GENERATED TRUE) -list(APPEND SOURCES ${rDictName}.cxx) - -# TODO use a custom target linked to root_generate_dictionary -set(R_ARTIFACTS ${CMAKE_CURRENT_BINARY_DIR}/lib${rDictName}_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/lib${rDictName}.rootmap) -install(FILES ${R_ARTIFACTS} - DESTINATION ${PACKAGE_INSTALL_LIB_DIR}) - set(libname ${PACKAGE_LIBPREFIX}Root) set(ULIB_SHARED_LIBRARIES ${ULIB_SHARED_LIBRARIES} ${libname} PARENT_SCOPE) set(ULIB_SELECTED_MODULES ${ULIB_SELECTED_MODULES} Root PARENT_SCOPE)