Merge pull request #305 from JeffersonLab/rasool_gluex_port_fixes_1

Fixes for GlueX
JeffersonLab · May 28, 2024 · e2b98db · e2b98db
2 parents 3bd580b + 3ca88f5
commit e2b98db
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,6 +49,10 @@ Makefile
 build/
 cmake-build-debug/
 install/
+bin/
+include/
+lib/
+programs/
 
 # Doxygen generated files
 docs/html/*

diff --git a/cmake/MakeConfig.cmake b/cmake/MakeConfig.cmake
@@ -61,6 +61,9 @@ else()
         get_filename_component(XERCESCROOT "${XercesC_INCLUDE_DIRS}" DIRECTORY)
         set(XERCES_CPPFLAGS "-I${XercesC_INCLUDE_DIRS} -I${XercesC_INCLUDE_DIRS}/xercesc")
         set(XERCES_LIBS "${XercesC_LIBRARIES}")
+    else()
+        set(JANA2_HAVE_XERCES 0)
+        set(XERCES3 0)
     endif()
 endif()
 
@@ -141,11 +144,11 @@ endif()
 set(HAVE_NUMA 0)
 
 configure_file(scripts/jana-config.in jana-config @ONLY)
-configure_file(scripts/jana_config.h.in jana_config.h @ONLY)
+configure_file(scripts/jana_config.h.in src/libraries/JANA/jana_config.h @ONLY)
 configure_file(scripts/jana-this.sh.in  jana-this.sh  @ONLY)
 configure_file(scripts/jana-this.csh.in jana-this.csh  @ONLY)
 
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jana-config DESTINATION bin)
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jana_config.h DESTINATION include/JANA)
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/src/libraries/JANA/jana_config.h DESTINATION include/JANA)
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jana-this.sh  DESTINATION bin)
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jana-this.csh  DESTINATION bin)
diff --git a/src/libraries/JANA/Compatibility/JGeometryXML.h b/src/libraries/JANA/Compatibility/JGeometryXML.h
@@ -14,7 +14,7 @@
 #include <JANA/Compatibility/JGeometry.h>
 #include <JANA/Compatibility/JStreamLog.h>
 #include <JANA/Calibrations/JCalibration.h>
-//#include <JANA/jana_config.h>
+#include <JANA/jana_config.h>
 
 #include <JANA/Compatibility/md5.h>
 

diff --git a/src/libraries/JANA/Utils/JTypeInfo.h b/src/libraries/JANA/Utils/JTypeInfo.h
@@ -12,7 +12,7 @@
 
 namespace JTypeInfo {
 
-
+#if __cplusplus >= 201703L
 template <typename, typename=void>
 struct is_parseable : std::false_type {};
 
@@ -24,6 +24,7 @@ struct is_serializable : std::false_type {};
 
 template <typename T>
 struct is_serializable<T, std::void_t<decltype(std::declval<std::ostream>() << std::declval<T>())>> : std::true_type {};
+#endif
 
 
 template<typename T>