Use vcpkg manifest

Author: Gold856

.github/workflows/vcpkg.yml

@@ -92,27 +92,7 @@ jobs:
           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 +105,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)}')
@@ -145,8 +124,8 @@ jobs:
       - 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 +141,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 }} \
@@ -192,7 +171,7 @@ jobs:
       - name: Run Python tests
         shell: bash
         run: |
-          export PATH="$PATH:$VCPKG_INSTALLATION_ROOT/installed/${{ matrix.triplet }}/bin"
+          export PATH="$PATH:$RUNNER_WORKSPACE/vcpkg_installed/${{ matrix.triplet }}/bin"
           cmake --build build --target python-install
           cmake --build build --target python-test
           cmake --build build --target python-test-unstable

cmake/HandleBoost.cmake

@@ -39,11 +39,8 @@ endif()
 ################################################################################
 
 # Set minimum required Boost version and components.
-# NOTE: "system" is intentionally omitted. It is a transitive dependency of other
-# components (like filesystem) and will be found automatically. Explicitly
-# requesting it can cause issues with modern header-only versions of Boost.
 set(BOOST_FIND_MINIMUM_VERSION 1.70)
-set(BOOST_FIND_MINIMUM_COMPONENTS serialization filesystem thread program_options date_time timer chrono regex)
+set(BOOST_FIND_MINIMUM_COMPONENTS serialization thread program_options date_time timer chrono regex)
 
 # Find the Boost package. On systems with modern installations (vcpkg, Homebrew),
 # this will use CMake's "Config mode". With manual installations (especially on
@@ -53,7 +50,7 @@ find_package(Boost ${BOOST_FIND_MINIMUM_VERSION} REQUIRED
              )
 
 # Verify that the required Boost component targets were successfully found and imported.
-foreach(_t IN ITEMS Boost::serialization Boost::filesystem Boost::thread Boost::date_time)
+foreach(_t IN ITEMS Boost::serialization Boost::thread Boost::date_time)
   if(NOT TARGET ${_t})
     message(FATAL_ERROR "Missing required Boost component target: ${_t}. Please install/upgrade Boost or set BOOST_ROOT/Boost_DIR correctly.")
   endif()
@@ -63,7 +60,6 @@ option(GTSAM_DISABLE_NEW_TIMERS "Disables using Boost.chrono for timing" OFF)
 
 set(GTSAM_BOOST_LIBRARIES
   Boost::serialization
-  Boost::filesystem
   Boost::thread
   Boost::date_time
   Boost::regex

gtsam/base/serializationTestHelpers.h

@@ -23,6 +23,7 @@
 
 #if GTSAM_ENABLE_BOOST_SERIALIZATION
 
+#include <filesystem>
 #include <iostream>
 #include <sstream>
 #include <string>
@@ -31,7 +32,6 @@
 #include <gtsam/base/TestableAssertions.h>
 
 #include <boost/serialization/serialization.hpp>
-#include <boost/filesystem.hpp>
 
 
 // whether to print the serialized text to stdout
@@ -47,10 +47,10 @@ T create() {
 }
 
 // Creates or empties a folder in the build folder and returns the relative path
-inline boost::filesystem::path resetFilesystem(
-    boost::filesystem::path folder = "actual") {
-  boost::filesystem::remove_all(folder);
-  boost::filesystem::create_directory(folder);
+inline std::filesystem::path resetFilesystem(
+    std::filesystem::path folder = "actual") {
+  std::filesystem::remove_all(folder);
+  std::filesystem::create_directory(folder);
   return folder;
 }
 
@@ -65,7 +65,7 @@ void roundtrip(const T& input, T& output) {
 // Templated round-trip serialization using a file
 template<class T>
 void roundtripFile(const T& input, T& output) {
-  boost::filesystem::path path = resetFilesystem()/"graph.dat";
+  std::filesystem::path path = resetFilesystem()/"graph.dat";
   serializeToFile(input, path.string());
   deserializeFromFile(path.string(), output);
 }
@@ -106,7 +106,7 @@ void roundtripXML(const T& input, T& output) {
 // Templated round-trip serialization using XML File
 template<class T>
 void roundtripXMLFile(const T& input, T& output) {
-  boost::filesystem::path path = resetFilesystem()/"graph.xml";
+  std::filesystem::path path = resetFilesystem()/"graph.xml";
   serializeToXMLFile(input, path.string());
   deserializeFromXMLFile(path.string(), output);
 }
@@ -147,7 +147,7 @@ void roundtripBinary(const T& input, T& output) {
 // Templated round-trip serialization using Binary file
 template<class T>
 void roundtripBinaryFile(const T& input, T& output) {
-  boost::filesystem::path path = resetFilesystem()/"graph.bin";
+  std::filesystem::path path = resetFilesystem()/"graph.bin";
   serializeToBinaryFile(input, path.string());
   deserializeFromBinaryFile(path.string(), output);
 }

gtsam_unstable/linear/QPSParser.cpp

@@ -32,7 +32,6 @@
 
 #include <boost/fusion/include/vector.hpp>
 #include <boost/fusion/sequence.hpp>
-#include <boost/lambda/lambda.hpp>
 #include <boost/phoenix/bind.hpp>
 #include <boost/spirit/include/classic.hpp>
 #include <boost/spirit/include/qi.hpp>

gtsam_unstable/slam/tests/testSerialization.cpp

@@ -17,16 +17,15 @@
 
 #include <CppUnitLite/TestHarness.h>
 
-#include <boost/filesystem.hpp>
-
+#include <filesystem>
 #include <iostream>
 #include <cstdlib>
 #include <fstream>
 #include <sstream>
 
 using namespace std;
 using namespace gtsam;
-namespace fs = boost::filesystem;
+namespace fs = std::filesystem;
 #ifdef TOPSRCDIR
 static string topdir = TOPSRCDIR;
 #else

vcpkg.json

@@ -0,0 +1,29 @@
+{
+  "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"
+  ],
+  "builtin-baseline": "74e6536215718009aae747d86d84b78376bf9e09"
+}