Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes for GlueX #305

Merged
merged 3 commits into from
May 28, 2024
Merged

Fixes for GlueX #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55d914d
Resolved JANA/jana-config.h not found error in JGeometryXML.h by modi…
RaiqaRasool May 7, 2024
85e2499
Restricted use of void_t to C++17 or later
RaiqaRasool May 7, 2024
3ca88f5
jana_config.h: Handle case of no XercesC correctly
nathanwbrei May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ Makefile
build/
cmake-build-debug/
install/
bin/
include/
lib/
programs/

# Doxygen generated files
docs/html/*
Expand Down
7 changes: 5 additions & 2 deletions cmake/MakeConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -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)
2 changes: 1 addition & 1 deletion src/libraries/JANA/Compatibility/JGeometryXML.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
3 changes: 2 additions & 1 deletion src/libraries/JANA/Utils/JTypeInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace JTypeInfo {


#if __cplusplus >= 201703L
template <typename, typename=void>
struct is_parseable : std::false_type {};

Expand All @@ -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>
Expand Down
Loading