s

Author: firewave

.github/workflows/CI-unixish.yml

@@ -62,7 +62,7 @@ jobs:
         run: |
           # make sure Boost is not used when disabled even though it is available
           cmake -S . -B cmake.output.boost-no -G "Unix Makefiles" -DUSE_BOOST=Off
-          if grep '\-DHAVE_BOOST' ./cmake.output.boost-no/compile_commands.json; then
+          if grep -q '\-DHAVE_BOOST' ./cmake.output.boost-no/compile_commands.json; then
             exit 1
           else
             exit 0
@@ -71,7 +71,7 @@ jobs:
       - name: Run CMake on macOS (with Boost)
         run: |
           cmake -S . -B cmake.output.boost -G "Unix Makefiles" -DBUILD_TESTS=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          grep '\-DHAVE_BOOST' ./cmake.output.boost/compile_commands.json
+          grep -q '\-DHAVE_BOOST' ./cmake.output.boost/compile_commands.json
 
       - name: Build with CMake on macOS (with Boost)
         run: |

cmake/findDependencies.cmake

@@ -83,11 +83,12 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.30")
     cmake_policy(SET CMP0167 NEW)
 endif()
 
-# we are only using the header-only "container" component so we can unconditionally search for it
-if(USE_BOOST AND NOT USE_BOOST STREQUAL "Auto")
-    find_package(Boost REQUIRED)
-else()
-    find_package(Boost)
+if(USE_BOOST)
+    if(USE_BOOST STREQUAL "Auto")
+        find_package(Boost)
+    else()
+        find_package(Boost REQUIRED)
+    endif()
 endif()
 
 find_program(LIBXML2_XMLLINT_EXECUTABLE xmllint)

cmake/options.cmake

@@ -31,6 +31,7 @@ if(WARNINGS_ARE_ERRORS)
 endif()
 option(EXTERNALS_AS_SYSTEM  "Treat externals as system includes"                            OFF)
 
+# we are only using the header-only "container" Boost component so we can unconditionally search for it by default
 set(USE_MATCHCOMPILER "Auto" CACHE STRING "Usage of match compiler")
 set_property(CACHE USE_MATCHCOMPILER PROPERTY STRINGS Auto Off On Verify)
 if(USE_MATCHCOMPILER)