Merge pull request #392 from JeffersonLab/nbrei_gluex_fixes

Clean up JANA/Compatibility
JeffersonLab · Dec 8, 2024 · e62d96c · e62d96c
2 parents 5381b9b + ea13765
commit e62d96c
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 43 deletions.
diff --git a/src/examples/PodioExample/CMakeLists.txt b/src/examples/PodioExample/CMakeLists.txt
@@ -10,7 +10,7 @@ if (USE_PODIO)
 
     add_executable(PodioExample ${PodioExample_SOURCES})
     target_link_libraries(PodioExample 
-        PUBLIC jana2 PodioDatamodel PodioDatamodelDict podio::podioRootIO)
+        PUBLIC jana2_static_lib PodioDatamodel PodioDatamodelDict podio::podioRootIO)
 
     set_target_properties(PodioExample PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
 

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 OBJECT 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) # To pull in the header file
 
 if (${USE_PODIO})
     target_link_libraries(jana2 PUBLIC podio::podio podio::podioRootIO ${ROOT_LIBRARIES})
@@ -79,7 +79,7 @@ endif()
 
 
 # static library, always there
-add_library(jana2_static_lib STATIC $<TARGET_OBJECTS:jana2>)
+add_library(jana2_static_lib STATIC $<TARGET_OBJECTS:jana2> $<TARGET_OBJECTS:VendoredMD5>)
 set_target_properties(jana2_static_lib PROPERTIES PREFIX "lib" OUTPUT_NAME "JANA")
 
 target_include_directories(jana2_static_lib PUBLIC $<INSTALL_INTERFACE:include>)
@@ -96,7 +96,7 @@ install(TARGETS jana2_static_lib EXPORT jana2_targets DESTINATION lib)
 # optionally build shared lib
 if (BUILD_SHARED_LIBS)
     message(STATUS "Building both shared and static libraries")
-    add_library(jana2_shared_lib SHARED $<TARGET_OBJECTS:jana2>)
+    add_library(jana2_shared_lib SHARED $<TARGET_OBJECTS:jana2> $<TARGET_OBJECTS:VendoredMD5>)
     set_target_properties(jana2_shared_lib PROPERTIES PREFIX "lib" OUTPUT_NAME "JANA")
 
     target_include_directories(jana2_shared_lib PUBLIC $<INSTALL_INTERFACE:include>)

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/JGeometry.h b/src/libraries/JANA/Compatibility/JGeometry.h
@@ -6,7 +6,6 @@
 //
 
 #pragma once
-#include "jerror.h"
 
 #include <map>
 #include <string>

diff --git a/src/libraries/JANA/Compatibility/JGeometryXML.cc b/src/libraries/JANA/Compatibility/JGeometryXML.cc
@@ -16,6 +16,7 @@ using namespace std;
 #include <JANA/JApplication.h>
 #include <JANA/Calibrations/JCalibrationManager.h>
 #include <JANA/Services/JParameterManager.h>
+#include <md5.h>
 #include "JGeometryXML.h"
 
 #if JANA2_HAVE_XERCES

diff --git a/src/libraries/JANA/Compatibility/JGeometryXML.h b/src/libraries/JANA/Compatibility/JGeometryXML.h
@@ -8,15 +8,11 @@
 #pragma once
 #include <iostream>
 
-#include <JANA/Compatibility/jerror.h>
 #include <JANA/Compatibility/JGeometry.h>
 #include <JANA/Compatibility/JStreamLog.h>
 #include <JANA/Calibrations/JCalibration.h>
 #include <JANA/JVersion.h>
 
-#include <JANA/Compatibility/md5.h>
-
-
 
 #if JANA2_HAVE_XERCES
 #if !defined(__CINT__) && !defined(__CLING__)

diff --git a/src/libraries/JANA/Compatibility/JGetObjectsFactory.h b/src/libraries/JANA/Compatibility/JGetObjectsFactory.h
diff --git a/src/programs/jana/CMakeLists.txt b/src/programs/jana/CMakeLists.txt
@@ -3,7 +3,7 @@
 add_executable(jana jana.cc )
 
 find_package(Threads REQUIRED)
-target_link_libraries(jana jana2 Threads::Threads)
+target_link_libraries(jana jana2_static_lib Threads::Threads)
 target_link_options(jana PRIVATE -rdynamic)
 install(TARGETS jana DESTINATION bin)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,6 @@

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