From aad69a019fa489cbaa4e07b0f0c822aa22e3cdb5 Mon Sep 17 00:00:00 2001 From: Pascal Raisig <praisig@ikf.uni-frankfurt.de> Date: Mon, 18 Jan 2021 15:27:02 +0100 Subject: [PATCH] Remove obsolete spadic v1.0 package The externally loaded spadic package is now longer required for the current spadic versions Hence, it can be removed from the cbmroot master and future release versions --- external/.gitignore | 1 - external/CMakeLists.txt | 1 - external/spadic/CMakeLists.txt | 47 ---------------------------------- 3 files changed, 49 deletions(-) delete mode 100644 external/spadic/CMakeLists.txt diff --git a/external/.gitignore b/external/.gitignore index 46ed7f2816..a0c1e79cd8 100644 --- a/external/.gitignore +++ b/external/.gitignore @@ -9,6 +9,5 @@ flib_dpb_20 ipc/ipc ipc_legacy/ipc jsroot -spadic/spadic googletest diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 20d2b6cb5b..8c6f00abf4 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -20,7 +20,6 @@ if(DOWNLOAD_EXTERNALS) Add_Subdirectory(ipc) Add_Subdirectory(flib_dpb) - Add_Subdirectory(spadic) Include(InstallVC.cmake) Include(InstallKFParticle.cmake) diff --git a/external/spadic/CMakeLists.txt b/external/spadic/CMakeLists.txt deleted file mode 100644 index 79ac0694b7..0000000000 --- a/external/spadic/CMakeLists.txt +++ /dev/null @@ -1,47 +0,0 @@ -# Build the spadic message reader library. -# The code is external in github as defined in the svn:extrenals. -# Add some extra compile warnings - -download_project_if_needed(PROJECT spadic - GIT_REPOSITORY https://github.com/spadic/spadic10-software - GIT_TAG 286875d1f543a169e29388d9673d2738f337de18 - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/spadic - TEST_FILE setup.py - ) - -Set(INCLUDE_DIRECTORIES - ${CBMROOT_SOURCE_DIR}/external/spadic/spadic/lib/message - ${CBMROOT_SOURCE_DIR}/external/spadic/spadic/lib/message/wrap/cpp -) - -Set(SYSTEM_INCLUDE_DIRECTORIES - ${Boost_INCLUDE_DIR} - ${CBMROOT_SOURCE_DIR}/external/flib_dpb/flib_dpb -) - -Include_Directories( ${INCLUDE_DIRECTORIES}) -Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) - -Set(LINK_DIRECTORIES -${Boost_LIBRARY_DIRS} -) - -Link_Directories( ${LINK_DIRECTORIES}) - -Set(C_SRCS -spadic/lib/message/message.c -spadic/lib/message/message_reader.c -) - -Set(CXX_SRCS -spadic/lib/message/wrap/cpp/Message.cpp -) - -Set_Source_Files_Properties(${CXX_SRCS} COMPILE_FLAGS "-Wall -pedantic -Wextra -Winit-self -Wundef -Wold-style-cast -Woverloaded-virtual -Wwrite-strings -Wnon-virtual-dtor") - -Set(SRCS ${C_SRCS} ${CXX_SRCS}) - -Set(LIBRARY_NAME spadicMessage) -Set(DEPENDENCIES) - -GENERATE_LIBRARY() -- GitLab