From 1e7e5447509d06167110eafec521daf7a28160e5 Mon Sep 17 00:00:00 2001 From: Gary Tunstall Date: Mon, 1 Nov 2021 00:08:51 +0000 Subject: [PATCH 1/3] Add environment var CMAKE_PREFIX_PATH back in so a valid json file is produced --- tools/windows_buildenv.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/windows_buildenv.bat b/tools/windows_buildenv.bat index 23268b1cc9c..3350a5060bf 100644 --- a/tools/windows_buildenv.bat +++ b/tools/windows_buildenv.bat @@ -88,6 +88,7 @@ EXIT /B 0 SET "VCPKG_ROOT=!BUILDENV_PATH!" SET "CMAKE_GENERATOR=Ninja" + SET CMAKE_PREFIX_PATH=!BUILDENV_PATH!\installed\x64-windows ECHO ^Environment Variables: ECHO ^- VCPKG_ROOT='!VCPKG_ROOT!' From 930cb3211f440332bf6bee0f83f0e380ccd858a7 Mon Sep 17 00:00:00 2001 From: Gary Tunstall Date: Mon, 1 Nov 2021 00:10:57 +0000 Subject: [PATCH 2/3] chan tab to a space to match --- tools/windows_buildenv.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/windows_buildenv.bat b/tools/windows_buildenv.bat index 3350a5060bf..3bbbdef90bd 100644 --- a/tools/windows_buildenv.bat +++ b/tools/windows_buildenv.bat @@ -88,7 +88,7 @@ EXIT /B 0 SET "VCPKG_ROOT=!BUILDENV_PATH!" SET "CMAKE_GENERATOR=Ninja" - SET CMAKE_PREFIX_PATH=!BUILDENV_PATH!\installed\x64-windows + SET CMAKE_PREFIX_PATH=!BUILDENV_PATH!\installed\x64-windows ECHO ^Environment Variables: ECHO ^- VCPKG_ROOT='!VCPKG_ROOT!' From f54c6c6fea790216d2d274968b393d074aadebf8 Mon Sep 17 00:00:00 2001 From: Gary Tunstall Date: Mon, 1 Nov 2021 00:11:53 +0000 Subject: [PATCH 3/3] Add quotes to match --- tools/windows_buildenv.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/windows_buildenv.bat b/tools/windows_buildenv.bat index 3bbbdef90bd..cae5ff098ec 100644 --- a/tools/windows_buildenv.bat +++ b/tools/windows_buildenv.bat @@ -88,7 +88,7 @@ EXIT /B 0 SET "VCPKG_ROOT=!BUILDENV_PATH!" SET "CMAKE_GENERATOR=Ninja" - SET CMAKE_PREFIX_PATH=!BUILDENV_PATH!\installed\x64-windows + SET "CMAKE_PREFIX_PATH=!BUILDENV_PATH!\installed\x64-windows" ECHO ^Environment Variables: ECHO ^- VCPKG_ROOT='!VCPKG_ROOT!'