Use vcpkg manifest

Author: Gold856

.github/workflows/vcpkg.yml

@@ -48,8 +48,8 @@ jobs:
         uses: actions/cache/restore@v3
         with:
           path: ${{ matrix.binary_cache }}
-          key: ${{ matrix.os }}
-          restore-keys: ${{ matrix.os }}
+          key: ${{ matrix.os }}-${{ hashFiles('vcpkg.json') }}
+          restore-keys: ${{ matrix.os }}-${{ hashFiles('vcpkg.json') }}
 
       - name: Setup msbuild
         if: runner.os == 'Windows'
@@ -61,13 +61,6 @@ jobs:
       - name: Install sccache
         uses: mozilla-actions/sccache-action@v0.0.9
 
-      - name: Use sccache
-        shell: bash
-        run: |
-          echo "SCCACHE_GHA_ENABLED=ON" >> "$GITHUB_ENV"
-          echo "CMAKE_C_COMPILER_LAUNCHER=sccache" >> "$GITHUB_ENV"
-          echo "CMAKE_CXX_COMPILER_LAUNCHER=sccache" >> "$GITHUB_ENV"
-
       - name: cl version
         if: runner.os == 'Windows'
         shell: cmd
@@ -85,34 +78,8 @@ jobs:
         run: |
           brew install autoconf autoconf-archive automake libtool
 
-      - name: Set vcpkg installtion root env
-        shell: bash
-        run: |
-          VCPKG_BASH_PATH=${VCPKG_INSTALLATION_ROOT//\\//}
-          echo "VCPKG_INSTALLATION_ROOT=$VCPKG_BASH_PATH" >> "$GITHUB_ENV"
-
       - name: "Install dependencies"
-        run: >
-          vcpkg x-set-installed --triplet ${{ matrix.triplet }} --host-triplet ${{ matrix.triplet }}
-          boost-assign
-          boost-bimap
-          boost-chrono
-          boost-date-time
-          boost-filesystem
-          boost-format
-          boost-graph
-          boost-math
-          boost-program-options
-          boost-regex
-          boost-serialization
-          boost-system
-          boost-thread
-          boost-timer
-          tbb
-          pybind11
-          geographiclib
-          eigen3
-          ${{ matrix.additional_vcpkg_ports }}
+        run: vcpkg install --triplet ${{ matrix.triplet }} --host-triplet ${{ matrix.triplet }}
 
       - name: On Failure, upload vcpkg logs
         if: failure()
@@ -125,9 +92,8 @@ jobs:
       - name: copy files for hash
         shell: bash
         run: |
-          echo $VCPKG_INSTALLATION_ROOT
           mkdir -p vcpkg-info
-          find $VCPKG_INSTALLATION_ROOT/installed/ -type f -name 'vcpkg_abi_info.txt' | \
+          find vcpkg_installed/ -type f -name 'vcpkg_abi_info.txt' | \
           while read filepath; do
             triplet=$(echo "$filepath" | awk -F/ '{print $(NF-3)}')
             port=$(echo "$filepath" | awk -F/ '{print $(NF-1)}')
@@ -136,17 +102,17 @@ jobs:
 
       - name: Save cache dependencies
         # Don't save if it's the exact same
-        if: steps.cache-restore.outputs.cache-matched-key != format('{0}-{1}', matrix.os, hashFiles('vcpkg-info/*'))
+        if: steps.cache-restore.outputs.cache-matched-key != format('{0}-{1}-{2}', matrix.os, hashFiles('vcpkg.json'), hashFiles('vcpkg-info/*'))
         uses: actions/cache/save@v4
         with:
           path: ${{ matrix.binary_cache }}
-          key: ${{ matrix.os }}-${{ hashFiles('vcpkg-info/*') }}
+          key: ${{ matrix.os }}-${{ hashFiles('vcpkg.json') }}-${{ hashFiles('vcpkg-info/*') }}
 
       - name: Install python packages
         shell: bash
         run: |
-          $VCPKG_INSTALLATION_ROOT/installed/${{ matrix.triplet }}/tools/python3/${{ matrix.python }} -m ensurepip --upgrade
-          $VCPKG_INSTALLATION_ROOT/installed/${{ matrix.triplet }}/tools/python3/${{ matrix.python }} -m pip install -r python/dev_requirements.txt
+          vcpkg_installed/${{ matrix.triplet }}/tools/python3/${{ matrix.python }} -m ensurepip --upgrade
+          vcpkg_installed/${{ matrix.triplet }}/tools/python3/${{ matrix.python }} -m pip install -r python/dev_requirements.txt
 
       - name: Set Swap Space (Linux)
         if: runner.os == 'Linux'
@@ -162,7 +128,7 @@ jobs:
 
           cmake . -B build -G Ninja \
               -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake \
-              -DVCPKG_INSTALLED_DIR=$VCPKG_INSTALLATION_ROOT/installed \
+              -DVCPKG_INSTALLED_DIR=$RUNNER_WORKSPACE/vcpkg_installed \
               -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }} \
               -DVCPKG_HOST_TRIPLET=${{ matrix.triplet }} \
               -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
@@ -183,6 +149,10 @@ jobs:
               -DGTSAM_WITH_EIGEN_MKL_OPENMP=ON \
               -DCTEST_EXTRA_ARGS='${{ matrix.ctest_extra_flags }}' \
               -DPYTEST_EXTRA_ARGS='${{ matrix.pytest_extra_flags }}'
+        env:
+          SCCACHE_GHA_ENABLED: ON
+          CMAKE_C_COMPILER_LAUNCHER: sccache
+          CMAKE_CXX_COMPILER_LAUNCHER: sccache
 
       - name: cmake build
         shell: bash

.gitignore

@@ -14,6 +14,7 @@
 .vscode
 .env
 /.vs/
+vcpkg_installed/
 /CMakeSettings.json
 # for QtCreator:
 CMakeLists.txt.user*

vcpkg.json

@@ -0,0 +1,30 @@
+{
+  "dependencies": [
+    "boost-concept-check",
+    "boost-fusion",
+    "boost-graph",
+    "boost-move",
+    "boost-optional",
+    "boost-phoenix",
+    "boost-pool",
+    "boost-program-options",
+    "boost-random",
+    "boost-range",
+    "boost-serialization",
+    "boost-smart-ptr",
+    "boost-spirit",
+    "boost-thread",
+    "boost-timer",
+    "boost-tokenizer",
+    "boost-type-traits",
+    {
+      "name": "intel-mkl",
+      "platform": "windows,linux"
+    },
+    "tbb",
+    "pybind11",
+    "geographiclib",
+    "eigen3"
+  ],
+  "builtin-baseline": "84bab45d415d22042bd0b9081aea57f362da3f35"
+}