From 6d1670b03cd651e182959fcf5e658358fe0fc7a5 Mon Sep 17 00:00:00 2001 From: Kyle Nelli Date: Mon, 16 Dec 2024 14:47:26 -0800 Subject: [PATCH 1/2] Fix boost include for old versions --- src/Domain/Structure/SegmentId.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Domain/Structure/SegmentId.cpp b/src/Domain/Structure/SegmentId.cpp index 1d4803c98455..3b29fa8d792f 100644 --- a/src/Domain/Structure/SegmentId.cpp +++ b/src/Domain/Structure/SegmentId.cpp @@ -3,7 +3,11 @@ #include "Domain/Structure/SegmentId.hpp" +#if BOOST_VERSION >= 106700 #include +#else +#include +#endif #include #include #include From 6ecbe382a037b14ffbedf4c3d119e7bc6cd80a56 Mon Sep 17 00:00:00 2001 From: Kyle Nelli Date: Mon, 16 Dec 2024 15:23:45 -0800 Subject: [PATCH 2/2] Don't run KleinGordon test for static execs --- containers/Dockerfile.buildenv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/Dockerfile.buildenv b/containers/Dockerfile.buildenv index ef035548a88e..ba5eb705f168 100644 --- a/containers/Dockerfile.buildenv +++ b/containers/Dockerfile.buildenv @@ -571,4 +571,4 @@ RUN if [ ${UBUNTU_VERSION} != 18.04 ] && [ "$TARGETARCH" != "amd64" ]; then \ .. \ && make ${PARALLEL_MAKE_ARG} CharacteristicExtract PreprocessCceWorldtube \ WriteCceWorldtubeCoordsToFile \ - && ctest -LE unit -R CharacteristicExtract + && ctest -LE unit -R CharacteristicExtract -E KleinGordon