More work on fixing the CI.

Author: JusticeRage

.github/workflows/ci.yml

@@ -41,9 +41,8 @@ jobs:
           if [ "${{ runner.os }}" = "macOS" ]; then
             OPENSSL_ROOT_DIR="$(brew --prefix openssl@3)"
             Boost_ROOT="$(brew --prefix boost)"
-            BOOST_CMAKE_DIR="$(find "${Boost_ROOT}/lib/cmake" -maxdepth 1 -type d -name 'Boost-*' | head -n 1)"
             CMAKE_PREFIX_PATH="${OPENSSL_ROOT_DIR};${Boost_ROOT}"
-            cmake -S . -B build -DTests=ON -DCMAKE_BUILD_TYPE=Release -DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" -DBoost_DIR="${BOOST_CMAKE_DIR}" -DBoost_ROOT="${Boost_ROOT}" -DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}"
+            cmake -S . -B build -DTests=ON -DCMAKE_BUILD_TYPE=Release -DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" -DBoost_ROOT="${Boost_ROOT}" -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}"
           else
             cmake -S . -B build -DTests=ON -DCMAKE_BUILD_TYPE=Release
           fi

CMakeLists.txt

@@ -40,6 +40,9 @@ endif()
 if (POLICY CMP0167)
     cmake_policy(SET CMP0167 NEW)
 endif()
+if (APPLE)
+    set(Boost_NO_BOOST_CMAKE ON)
+endif()
 
 if (APPLE)
     set(CMAKE_MACOSX_RPATH 1)
@@ -52,6 +55,7 @@ set(MANALYZE_BOOST_MODE "")
 set(MANALYZE_BOOST_HEADER_TARGET "")
 set(MANALYZE_BOOST_SYSTEM_TARGET "")
 set(MANALYZE_BOOST_UNIT_TEST_TARGET "")
+add_library(manalyze_boost_headers INTERFACE)
 
 set(MANALYZE_BOOST_REQUIRED FALSE)
 if (MANALYZE_BUILD_VIRUSTOTAL OR Tests MATCHES [Oo][Nn])
@@ -60,7 +64,9 @@ endif()
 
 if (MANALYZE_BOOST_REQUIRED)
     set(MANALYZE_BOOST_CONFIG_OK FALSE)
-    find_package(Boost CONFIG QUIET)
+    if (NOT Boost_NO_BOOST_CMAKE)
+        find_package(Boost CONFIG QUIET)
+    endif()
 
     if (Boost_FOUND)
         if (TARGET Boost::headers)
@@ -116,8 +122,7 @@ if (MANALYZE_BOOST_REQUIRED)
             set(MANALYZE_BOOST_HEADER_TARGET Boost::headers)
         elseif (TARGET Boost::boost)
             set(MANALYZE_BOOST_HEADER_TARGET Boost::boost)
-        else()
-            add_library(manalyze_boost_headers INTERFACE)
+        elseif (Boost_INCLUDE_DIRS)
             target_include_directories(manalyze_boost_headers INTERFACE ${Boost_INCLUDE_DIRS})
             set(MANALYZE_BOOST_HEADER_TARGET manalyze_boost_headers)
         endif()
@@ -170,6 +175,9 @@ else()
 endif()
 
 if (MANALYZE_BUILD_VIRUSTOTAL)
+    if (MANALYZE_BOOST_HEADER_TARGET AND NOT MANALYZE_BOOST_HEADER_TARGET STREQUAL "manalyze_boost_headers")
+        target_link_libraries(manalyze_boost_headers INTERFACE ${MANALYZE_BOOST_HEADER_TARGET})
+    endif()
     if (NOT MANALYZE_BOOST_SYSTEM_TARGET OR NOT MANALYZE_BOOST_HEADER_TARGET)
         message(FATAL_ERROR "Boost headers and Boost::system are required to build the VirusTotal plugin.")
     endif()
@@ -188,7 +196,7 @@ endif()
 
 set(MANALYZE_BOOST_VT_LIBS "")
 if (MANALYZE_BUILD_VIRUSTOTAL)
-    list(APPEND MANALYZE_BOOST_VT_LIBS ${MANALYZE_BOOST_SYSTEM_TARGET} ${MANALYZE_BOOST_HEADER_TARGET})
+    list(APPEND MANALYZE_BOOST_VT_LIBS ${MANALYZE_BOOST_SYSTEM_TARGET} manalyze_boost_headers)
 else()
     message(STATUS "VirusTotal plugin disabled (MANALYZE_BUILD_VIRUSTOTAL=OFF)")
 endif()