From 567a770ed9807f6b35b34f740aa8891f7c5d10db Mon Sep 17 00:00:00 2001 From: Lion Kortlepel Date: Tue, 5 Dec 2023 14:46:01 +0100 Subject: [PATCH] fix vcpkg cmake to not run when CMAKE_TOOLCHAIN_FILE is defined --- .github/workflows/{build-linux.yml => linux.yml} | 0 .github/workflows/{build-windows.yml => windows.yml} | 0 cmake/Vcpkg.cmake | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{build-linux.yml => linux.yml} (100%) rename .github/workflows/{build-windows.yml => windows.yml} (100%) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/linux.yml similarity index 100% rename from .github/workflows/build-linux.yml rename to .github/workflows/linux.yml diff --git a/.github/workflows/build-windows.yml b/.github/workflows/windows.yml similarity index 100% rename from .github/workflows/build-windows.yml rename to .github/workflows/windows.yml diff --git a/cmake/Vcpkg.cmake b/cmake/Vcpkg.cmake index f31ed4d..f10b159 100644 --- a/cmake/Vcpkg.cmake +++ b/cmake/Vcpkg.cmake @@ -1,4 +1,4 @@ -if(NOT CMAKE_TOOLCHAIN_FILE) +if(NOT DEFINED CMAKE_TOOLCHAIN_FILE) if(NOT EXISTS ${CMAKE_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake) find_package(Git) if(Git_FOUND)