Should fix issues vcpkg finding packages
This commit is contained in:
parent
abc21b4edf
commit
d63206fa58
|
@ -12,5 +12,5 @@ build:
|
||||||
script:
|
script:
|
||||||
# Set the VCPKG_TOOLCHAIN environment variable
|
# Set the VCPKG_TOOLCHAIN environment variable
|
||||||
- export VCPKG_TOOLCHAIN=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake
|
- 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
|
- cmake --build build
|
|
@ -9,9 +9,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
|
||||||
|
|
||||||
#include(C:/users/jmchr/vcpkg/scripts/buildsystems/vcpkg.cmake)
|
#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})
|
if(DEFINED ENV{VCPKG_TOOLCHAIN})
|
||||||
include("$ENV{VCPKG_TOOLCHAIN}")
|
set(CMAKE_TOOLCHAIN_FILE $ENV{VCPKG_TOOLCHAIN})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Find packages using vcpkg
|
# Find packages using vcpkg
|
||||||
|
|
Loading…
Reference in New Issue