Small fix

.github/workflows/all.yml

@@ -13,13 +13,6 @@ jobs:
     strategy:
       # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
       fail-fast: false
-
-      # Set up a matrix to run the following 3 configurations:
-      # 1. <Windows, Release, latest MSVC compiler toolchain on the default runner image, default generator>
-      # 2. <Linux, Release, latest GCC compiler toolchain on the default runner image, default generator>
-      # 3. <Linux, Release, latest Clang compiler toolchain on the default runner image, default generator>
-      #
-      # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         build_type: [Release, Debug]
@@ -31,33 +24,30 @@ jobs:
       if: matrix.os == 'ubuntu-latest'
       id: boost
       shell: bash
-      run: | 
-        DEPS_DIR="${{ github.workspace }}/deps"
-        BOOST_LIBRARIES="chrono,system,test"
-        BOOST_VERSION="1.70.0"
-        BOOST_URL="https://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/boost_${BOOST_VERSION//\./_}.tar.gz"
-        BOOST_DIR="${DEPS_DIR}/boost"
-        echo "Downloading Boost ${BOOST_VERSION} from ${BOOST_URL}"
-        mkdir -p ${BOOST_DIR} && cd ${BOOST_DIR}
-        wget -O - ${BOOST_URL} | tar --strip-components=1 -xz -C ${BOOST_DIR} || exit 1
-        ./bootstrap.sh --with-libraries=${BOOST_LIBRARIES} && ./b2
-        export BOOST_ROOT=${BOOST_DIR}
-        echo "boost-root-dir=$BOOST_ROOT" >> "$GITHUB_OUTPUT"
+      run: sudo apt-get install libboost-all-dev
 
     - name: Install Boost (MacOs)
       if: matrix.os == 'macos-latest'
       id: boost-macos
       shell: bash
-      run: | 
+      run: |
         brew install boost
         export BOOST_ROOT=$(brew --prefix boost)
         echo "boost-root-dir=$BOOST_ROOT" >> "$GITHUB_OUTPUT"
 
-    - name: Verify Boost (MacOs)
-      if: matrix.os == 'macos-latest'
-      shell: bash
-      run: | 
-        ls /opt/homebrew/opt/boost/lib
+    - name: Install vcpkg
+      if: matrix.os == 'windows-latest'
+      run: |
+        git clone https://github.com/microsoft/vcpkg.git
+        cd vcpkg
+        git checkout master  # Use a specific version if needed
+        ./bootstrap-vcpkg.bat
+
+    - name: Install Boost (Windows)
+      if: matrix.os == 'windows-latest'
+      run: |
+        cd vcpkg
+        .\vcpkg.exe install boost-algorithm boost-assert boost-test boost-system boost-chrono boost-container --triplet x64-windows
 
     - name: Set build directory
       id: strings
@@ -68,20 +58,67 @@ jobs:
     - name: Configure CMake (Linux)
       if: matrix.os == 'ubuntu-latest'
       run: >
-        export BOOST_ROOT="${{ steps.boost.outputs.boost-root-dir }}" && echo "$BOOST_ROOT" && cmake -B ${{ steps.strings.outputs.build-output-dir }}
+        cmake -B ${{ steps.strings.outputs.build-output-dir }}
         -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+        -DCMAKE_PREFIX_PATH="${{ steps.boost.outputs.boost-root-dir }}"
+        -DBOOST_ROOT="${{ steps.boost.outputs.boost-root-dir }}"
+        -DBoost_DIR="${{ steps.boost.outputs.boost-root-dir }}"
+        -DBoost_NO_BOOST_CMAKE=ON
+        -DBoost_NO_SYSTEM_PATHS=ON
+        -DBoost_USE_STATIC_LIBS=OFF
+        -DBoost_USE_STATIC_RUNTIME=OFF
+        -DSPOTIFY_JSON_USE_SSE42=OFF
+        -S ${{ github.workspace }}
+
+    - name: Configure CMake (Windows)
+      if: matrix.os == 'windows-latest'
+      run: >
+        cmake -B ${{ steps.strings.outputs.build-output-dir }}
+        -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake
+        -DBOOST_ROOT="./vcpkg/installed/x64-windows"
+        -DBoost_NO_SYSTEM_PATHS=ON
+        -DBoost_LIBRARY_DIRS="${{ github.workspace }}\vcpkg\installed\x64-windows\lib"
+        -DBoost_INCLUDE_DIR="${{ github.workspace }}\vcpkg\installed\x64-windows\include"
+        -DBoost_USE_STATIC_LIBS=OFF
+        -DSPOTIFY_JSON_USE_SSE42=OFF
         -S ${{ github.workspace }}
 
     - name: Configure CMake (MacOs)
       if: matrix.os == 'macos-latest'
       run: >
         cmake -B ${{ steps.strings.outputs.build-output-dir }}
-        -DCMAKE_PREFIX_PATH="/opt/homebrew/opt/boost" -DBoost_ROOT="/opt/homebrew/opt/boost" -DBOOST_LIBRARYDIR="/opt/homebrew/opt/boost/lib"
+        -DCMAKE_PREFIX_PATH="/opt/homebrew/opt/boost"
+        -DBOOST_ROOT="/opt/homebrew/opt/boost"
+        -DBoost_NO_BOOST_CMAKE=ON
+        -DBOOST_LIBRARYDIR="/opt/homebrew/opt/boost/lib"
+        -DBoost_USE_STATIC_LIBS=OFF
+        -DBoost_USE_STATIC_RUNTIME=OFF
         -S ${{ github.workspace }}
-        
+
     - name: Build
       run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}
 
+    - name: Test (Linux / MacOS)
+      if: matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest'
+      working-directory: ${{ steps.strings.outputs.build-output-dir }}
+      run: ctest --build-config ${{ matrix.build_type }} --rerun-failed --output-on-failure
+
     - name: Test
+      if: matrix.os == 'windows-latest'
+      working-directory: ${{ steps.strings.outputs.build-output-dir }}
+      shell: pwsh
+      run: |
+        $env:PATH += ";${{ github.workspace }}\vcpkg\installed\x64-windows\bin"
+        $env:PATH += ";${{ github.workspace }}\vcpkg\installed\x64-windows\debug\bin"
+        ctest --build-config ${{ matrix.build_type }} --rerun-failed --output-on-failure --parallel 4 -V
+
+    - name: Install valgrind (Linux)
+      if: matrix.os == 'ubuntu-latest'
+      shell: bash
+      run: sudo apt-get install -qq valgrind
+
+    - name: Run valgrind test (Linux)
+      if: matrix.os == 'ubuntu-latest'
       working-directory: ${{ steps.strings.outputs.build-output-dir }}
-      run: ctest --build-config ${{ matrix.build_type }}
+      shell: bash
+      run: valgrind --leak-check=full ./test/spotify_json_test

CMakeLists.txt

@@ -12,9 +12,19 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-cmake_minimum_required(VERSION 3.15.0)
+cmake_minimum_required(VERSION 3.21.0)
 project(spotify-json)
 
+# Set policy for CMP0144 to enable upper-case BOOST_ROOT usage
+if (POLICY CMP0144)
+    cmake_policy(SET CMP0144 NEW)
+endif()
+
+# Set policy for CMP0167 to rely on BoostConfig.cmake rather than FindBoost
+if (POLICY CMP0167)
+    cmake_policy(SET CMP0167 NEW)
+endif()
+
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
@@ -174,10 +184,6 @@ target_link_libraries(${json_library_TARGET} double-conversion)
 
 option(SPOTIFY_JSON_BUILD_TESTS "Build tests and benchmarks" ON)
 if(SPOTIFY_JSON_BUILD_TESTS)
-  set(Boost_USE_MULTITHREADED ON)
-  set(Boost_USE_STATIC_LIBS ON)
-  set(Boost_USE_STATIC_RUNTIME ON)
-
   find_package(Boost COMPONENTS chrono unit_test_framework system)
 
   if(Boost_FOUND)