Merge pull request #19 from MichaelMiller-/feature/dependency-management

make use of vcpkg manifest mode
MichaelMiller- · Jan 12, 2025 · 512cd9e · 512cd9e
2 parents 1c04b79 + 84edac4
commit 512cd9e
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 46 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -10,14 +10,6 @@ install:
   - git pull
   - .\bootstrap-vcpkg.bat
   - cd %APPVEYOR_BUILD_FOLDER%
-  - vcpkg install boost-mp11:x64-windows
-  - vcpkg install boost-math:x64-windows
-  - vcpkg install boost-qvm:x64-windows
-  - vcpkg install boost-ublas:x64-windows
-  - vcpkg install boost-locale:x64-windows
-  - vcpkg install catch2:x64-windows
-  - vcpkg install nlohmann-json:x64-windows
-  - vcpkg install spdlog:x64-windows
   - cd c:\tools\vcpkg
   - vcpkg integrate install
 

diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml
@@ -41,9 +41,6 @@ jobs:
           git clone https://github.com/Microsoft/vcpkg.git 
           cd vcpkg
           ./bootstrap-vcpkg.sh
-          ./vcpkg install catch2
-          ./vcpkg install nlohmann-json
-          ./vcpkg install fmt
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{runner.workspace}}/build

diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -26,9 +26,6 @@ jobs:
           git clone https://github.com/Microsoft/vcpkg.git 
           cd vcpkg
           ./bootstrap-vcpkg.sh
-          ./vcpkg install catch2
-          ./vcpkg install nlohmann-json
-          ./vcpkg install fmt
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{runner.workspace}}/build

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -38,18 +38,6 @@ jobs:
         git clone https://github.com/Microsoft/vcpkg.git 
         cd vcpkg
         ./bootstrap-vcpkg.sh
-        ./vcpkg install boost-core
-        ./vcpkg install boost-function-types 
-        ./vcpkg install boost-geometry
-        ./vcpkg install boost-hana
-        ./vcpkg install boost-math
-        ./vcpkg install boost-qvm
-        ./vcpkg install boost-range
-        ./vcpkg install boost-ublas
-        ./vcpkg install boost-mp11
-        ./vcpkg install catch2
-        ./vcpkg install nlohmann-json
-        ./vcpkg install spdlog
         cd ..
         cmake . -DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake
         cmake --build . -- -j4

diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml
@@ -38,9 +38,6 @@ jobs:
           git clone https://github.com/Microsoft/vcpkg.git 
           cd vcpkg
           ./bootstrap-vcpkg.sh
-          ./vcpkg install catch2
-          ./vcpkg install nlohmann-json
-          ./vcpkg install fmt
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{runner.workspace}}/build

diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
@@ -25,19 +25,6 @@ jobs:
         git clone https://github.com/Microsoft/vcpkg.git 
         cd vcpkg
         bootstrap-vcpkg.bat
-        vcpkg install boost-core:x64-windows
-        vcpkg install boost-function-types:x64-windows 
-        vcpkg install boost-hana:x64-windows
-        vcpkg install boost-math:x64-windows
-        vcpkg install boost-qvm:x64-windows
-        vcpkg install boost-range:x64-windows
-        vcpkg install boost-mp11:x64-windows
-        vcpkg install boost-algorithm:x64-windows
-        vcpkg install boost-date-time:x64-windows
-        vcpkg install catch2:x64-windows
-        vcpkg install fmt:x64-windows
-        vcpkg install nlohmann-json:x64-windows
-        vcpkg integrate install
 
     - name: Create Build Environment
       run: cmake -E make_directory ${{runner.workspace}}/build

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,6 +1,4 @@
 find_package(Catch2 CONFIG REQUIRED)
-find_package(Boost 1.70 REQUIRED)
-find_package(fmt REQUIRED)
 find_package(nlohmann_json CONFIG REQUIRED)
 
 ## Speed up the compile-time process
@@ -21,10 +19,8 @@ if (SEC21_ENABLE_COVERAGE)
     target_link_libraries(${target_name} PRIVATE gcov)
 endif ()
 
-    target_link_libraries(${target_name} PRIVATE Boost::boost)
     target_link_libraries(${target_name} PRIVATE catch_main)
     target_link_libraries(${target_name} PRIVATE sec21::sec21)
-    target_link_libraries(${target_name} PRIVATE fmt::fmt-header-only)
     target_link_libraries(${target_name} PRIVATE nlohmann_json nlohmann_json::nlohmann_json)
 
     add_test(

diff --git a/vcpkg.json b/vcpkg.json
@@ -0,0 +1,6 @@
+{
+  "dependencies": [
+    "catch2",
+    "nlohmann-json"
+  ]
+}