Skip to content

Commit 39fb6f4

Browse files
committed
squash
1 parent e0bf93e commit 39fb6f4

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ endif()
88

99
if(VCPKG)
1010
set(VCPKG_LIBRARY_LINKAGE "static")
11-
if(DEFINED ENV{VCPKG_ROOT})
11+
if(DEFINED ENV{VCPKG_INSTALLATION_ROOT})
12+
set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "")
13+
elseif(DEFINED ENV{VCPKG_ROOT})
1214
set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "")
1315
endif()
1416
endif()

0 commit comments

Comments
 (0)