Move vendored md5 into its own private target

JeffersonLab · Dec 7, 2024 · 43638a7 · 43638a7
1 parent 877a748
commit 43638a7
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -0,0 +1,6 @@
+
+add_library(VendoredMD5 STATIC md5.c)
+target_include_directories(VendoredMD5 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+
+
+
diff --git a/src/libraries/JANA/Compatibility/md5.c → src/external/md5/md5.c b/src/libraries/JANA/Compatibility/md5.c → src/external/md5/md5.c
diff --git a/src/libraries/JANA/Compatibility/md5.h → src/external/md5/md5.h b/src/libraries/JANA/Compatibility/md5.h → src/external/md5/md5.h
diff --git 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
@@ -22,7 +22,7 @@ using namespace std;
 
 #include <JANA/Services/JParameterManager.h>
 #include <JANA/Calibrations/JLargeCalibration.h>
-#include "JANA/Compatibility/md5.h"
+#include <md5.h>
 
 
 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
@@ -16,7 +16,7 @@ using namespace std;
 #include <JANA/JApplication.h>
 #include <JANA/Calibrations/JCalibrationManager.h>
 #include <JANA/Services/JParameterManager.h>
-#include <JANA/Compatibility/md5.h>
+#include <md5.h>
 #include "JGeometryXML.h"
 
 #if JANA2_HAVE_XERCES
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,6 @@

		add_library(VendoredMD5 STATIC md5.c)
		target_include_directories(VendoredMD5 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)