diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt index fbd043d47..fcc771d80 100644 --- a/src/external/CMakeLists.txt +++ b/src/external/CMakeLists.txt @@ -1,3 +1,4 @@ add_subdirectory(catch2) +add_subdirectory(md5) add_subdirectory(tomlplusplus) diff --git a/src/external/md5/CMakeLists.txt b/src/external/md5/CMakeLists.txt new file mode 100644 index 000000000..dcbe70c22 --- /dev/null +++ b/src/external/md5/CMakeLists.txt @@ -0,0 +1,6 @@ + +add_library(VendoredMD5 STATIC md5.c) +target_include_directories(VendoredMD5 PUBLIC $) + + + diff --git a/src/libraries/JANA/Compatibility/md5.c b/src/external/md5/md5.c similarity index 100% rename from src/libraries/JANA/Compatibility/md5.c rename to src/external/md5/md5.c diff --git a/src/libraries/JANA/Compatibility/md5.h b/src/external/md5/md5.h similarity index 100% rename from src/libraries/JANA/Compatibility/md5.h rename to src/external/md5/md5.h diff --git a/src/libraries/JANA/CMakeLists.txt b/src/libraries/JANA/CMakeLists.txt index 08f5e9f17..a09fa5db4 100644 --- a/src/libraries/JANA/CMakeLists.txt +++ b/src/libraries/JANA/CMakeLists.txt @@ -51,7 +51,6 @@ set(JANA2_SOURCES Compatibility/JStreamLogBuffer.cc Compatibility/JGeometryManager.cc Compatibility/JGeometryXML.cc - Compatibility/md5.c ) if (${USE_PODIO}) @@ -70,6 +69,7 @@ find_package(Threads REQUIRED) set(THREADS_PREFER_PTHREAD_FLAG ON) target_link_libraries(jana2 PUBLIC ${CMAKE_DL_LIBS} Threads::Threads) target_link_libraries(jana2 PRIVATE VendoredTomlPlusPlus) +target_link_libraries(jana2 PRIVATE VendoredMD5) if (${USE_PODIO}) target_link_libraries(jana2 PUBLIC podio::podio podio::podioRootIO ${ROOT_LIBRARIES}) diff --git a/src/libraries/JANA/Calibrations/JLargeCalibration.cc b/src/libraries/JANA/Calibrations/JLargeCalibration.cc index c11481d72..c017d0ed8 100644 --- a/src/libraries/JANA/Calibrations/JLargeCalibration.cc +++ b/src/libraries/JANA/Calibrations/JLargeCalibration.cc @@ -22,7 +22,7 @@ using namespace std; #include #include -#include "JANA/Compatibility/md5.h" +#include static pthread_mutex_t resource_manager_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/src/libraries/JANA/Compatibility/JGeometryXML.cc b/src/libraries/JANA/Compatibility/JGeometryXML.cc index f275a5e95..5a438103d 100644 --- a/src/libraries/JANA/Compatibility/JGeometryXML.cc +++ b/src/libraries/JANA/Compatibility/JGeometryXML.cc @@ -16,7 +16,7 @@ using namespace std; #include #include #include -#include +#include #include "JGeometryXML.h" #if JANA2_HAVE_XERCES