Skip to content

Add VCPKG_SCRIPTS_DIR and VCPKG_TOOLS_DIR to the CMake command call #1420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add VCPKG_SCRIPTS_DIR and VCPKG_TOOLS_DIR to the CMake command call #1420

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9ed034
Add VCPKG_SCRIPTS_DIR and VCPKG_TOOLS_DIR to the CMake command call
Neumann-A Jun 10, 2024
d2f6a29
change VCPKG_SCRIPTS_DIR to SCRIPTS
Neumann-A Jul 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/vcpkg/buildenvironment.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Contributor Author

@Neumann-A Neumann-A Jun 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be just SCRIPTS since it is already defined in ports.cmake ?

Copy link
Member

@BillyONeal BillyONeal Jul 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That makes sense to me

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);
}
Expand Down