From d63206fa58b38e06da20473bdee84d1ba0a72f4e Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Mon, 12 Aug 2024 17:03:03 -0400 Subject: [PATCH] Should fix issues vcpkg finding packages --- .gitlab-ci.yml | 2 +- CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bfc639d..f6a2dc7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,5 +12,5 @@ build: script: # Set the VCPKG_TOOLCHAIN environment variable - export VCPKG_TOOLCHAIN=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake - - cmake -B build -S . -G Ninja + - cmake -B build -S . -G Ninja -DCMAKE_TOOLCHAIN_FILE=$VCPKG_TOOLCHAIN - cmake --build build \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ea04df..4117476 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,9 +9,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) #include(C:/users/jmchr/vcpkg/scripts/buildsystems/vcpkg.cmake) -# Use the environment variable if it is set +# Use the vcpkg toolchain file if(DEFINED ENV{VCPKG_TOOLCHAIN}) - include("$ENV{VCPKG_TOOLCHAIN}") + set(CMAKE_TOOLCHAIN_FILE $ENV{VCPKG_TOOLCHAIN}) endif() # Find packages using vcpkg