aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-03-10 16:43:28 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2017-03-10 17:04:29 -0800
commit62fcffff856aa2b6ef61601ecaf025166111bb02 (patch)
tree01f7bca4efcd183d0fe52208509e50c9e102a849 /toolsrc/src
parent9ca839390e8ada8080a25ac92435a11c52ae41e6 (diff)
downloadvcpkg-62fcffff856aa2b6ef61601ecaf025166111bb02.tar.gz
vcpkg-62fcffff856aa2b6ef61601ecaf025166111bb02.zip
`integrate`: Use paths.get_nuget_exe()
Diffstat (limited to 'toolsrc/src')
-rw-r--r--toolsrc/src/commands_integrate.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/toolsrc/src/commands_integrate.cpp b/toolsrc/src/commands_integrate.cpp
index 6d28da6ab..4ccd6d435 100644
--- a/toolsrc/src/commands_integrate.cpp
+++ b/toolsrc/src/commands_integrate.cpp
@@ -213,11 +213,11 @@ namespace vcpkg::Commands::Integrate
System::println(System::color::success, "Applied user-wide integration for this vcpkg root.");
const fs::path cmake_toolchain = paths.buildsystems / "vcpkg.cmake";
System::println("\n"
- "All MSBuild C++ projects can now #include any installed libraries.\n"
- "Linking will be handled automatically.\n"
- "Installing new libraries will make them instantly available.\n"
- "\n"
- "CMake projects should use -DCMAKE_TOOLCHAIN_FILE=%s", cmake_toolchain.generic_string());
+ "All MSBuild C++ projects can now #include any installed libraries.\n"
+ "Linking will be handled automatically.\n"
+ "Installing new libraries will make them instantly available.\n"
+ "\n"
+ "CMake projects should use -DCMAKE_TOOLCHAIN_FILE=%s", cmake_toolchain.generic_string());
exit(EXIT_SUCCESS);
}
@@ -249,7 +249,7 @@ namespace vcpkg::Commands::Integrate
static void integrate_project(const vcpkg_paths& paths)
{
- Environment::ensure_nuget_on_path(paths);
+ const fs::path& nuget_exe = paths.get_nuget_exe();
const fs::path& buildsystems_dir = paths.buildsystems;
const fs::path tmp_dir = buildsystems_dir / "tmp";
@@ -267,7 +267,7 @@ namespace vcpkg::Commands::Integrate
std::ofstream(nuspec_file_path) << create_nuspec_file(paths.root, nuget_id, nupkg_version);
// Using all forward slashes for the command line
- const std::wstring cmd_line = Strings::wformat(LR"(nuget.exe pack -OutputDirectory "%s" "%s" > nul)", buildsystems_dir.native(), nuspec_file_path.native());
+ const std::wstring cmd_line = Strings::wformat(LR"("%s" pack -OutputDirectory "%s" "%s" > nul)", nuget_exe.native(), buildsystems_dir.native(), nuspec_file_path.native());
const int exit_code = System::cmd_execute(cmd_line);