From b9ed0343e0d9772f4228a00ae67e09bf8ad2052e Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 10 Jun 2024 12:02:20 +0200 Subject: [PATCH 1/2] Add VCPKG_SCRIPTS_DIR and VCPKG_TOOLS_DIR to the CMake command call --- src/vcpkg/buildenvironment.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/vcpkg/buildenvironment.cpp b/src/vcpkg/buildenvironment.cpp index b57caf74ff..b94d88f279 100644 --- a/src/vcpkg/buildenvironment.cpp +++ b/src/vcpkg/buildenvironment.cpp @@ -17,6 +17,8 @@ namespace vcpkg local_variables.emplace_back("BUILDTREES_DIR", paths.buildtrees()); local_variables.emplace_back("_VCPKG_INSTALLED_DIR", paths.installed().root()); local_variables.emplace_back("DOWNLOADS", paths.downloads); + local_variables.emplace_back("VCPKG_SCRIPTS_DIR", paths.scripts); + local_variables.emplace_back("VCPKG_TOOLS_DIR", paths.tools); local_variables.emplace_back("VCPKG_MANIFEST_INSTALL", "OFF"); return make_basic_cmake_cmd(paths.get_tool_exe(Tools::CMAKE, out_sink), cmake_script, local_variables); } From d2f6a29d12d5d8ba5d49be27591362e44bbd148c Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 6 Jul 2024 14:58:19 +0200 Subject: [PATCH 2/2] change VCPKG_SCRIPTS_DIR to SCRIPTS --- src/vcpkg/buildenvironment.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vcpkg/buildenvironment.cpp b/src/vcpkg/buildenvironment.cpp index b94d88f279..c1241d3845 100644 --- a/src/vcpkg/buildenvironment.cpp +++ b/src/vcpkg/buildenvironment.cpp @@ -17,7 +17,7 @@ namespace vcpkg local_variables.emplace_back("BUILDTREES_DIR", paths.buildtrees()); local_variables.emplace_back("_VCPKG_INSTALLED_DIR", paths.installed().root()); local_variables.emplace_back("DOWNLOADS", paths.downloads); - local_variables.emplace_back("VCPKG_SCRIPTS_DIR", paths.scripts); + local_variables.emplace_back("SCRIPTS", paths.scripts); local_variables.emplace_back("VCPKG_TOOLS_DIR", paths.tools); local_variables.emplace_back("VCPKG_MANIFEST_INSTALL", "OFF"); return make_basic_cmake_cmd(paths.get_tool_exe(Tools::CMAKE, out_sink), cmake_script, local_variables);