fix: macOS runner includes boost 1.83.0 in the system paths

equinor · Jan 24, 2024 · b2ec7a8 · b2ec7a8
1 parent aa141c8
commit b2ec7a8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/cmake/boost.cmake b/cmake/boost.cmake
@@ -52,3 +52,7 @@ find_package(Boost
         COMPONENTS filesystem system
         PATHS ${Boost_LIBRARY_DIR}/cmake
 )
+# Helper-macro to toggle whether boost is intentionally requested.
+# When building on GitHub Action runners, boost is available and added to the system path
+# It is used by boost-filesystem.hpp
+add_compile_definitions(USE_BOOST)
diff --git a/src/nrlib/iotools/boost-filesystem.hpp b/src/nrlib/iotools/boost-filesystem.hpp
@@ -5,7 +5,7 @@
 #ifndef BOOST_FILESYSTEM_HPP
 #define BOOST_FILESYSTEM_HPP
 
-#if __has_include(<boost/filesystem.hpp>)
+#if defined(USE_BOOST) && __has_include(<boost/filesystem.hpp>)
 // The helper methods that depend on boost::filesystem, is not used by the main
 // gaussianfft library, but som of the debug functionallity use them
 #include <boost/filesystem.hpp>