aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/vcpkg.cpp
diff options
context:
space:
mode:
authorAlexander Neumann <alexander.neumann@hamburg.de>2019-08-12 09:28:24 +0200
committerAlexander Neumann <alexander.neumann@hamburg.de>2019-08-12 09:28:24 +0200
commitc4231c51e47221345525ce68b65b28ab905087e2 (patch)
tree3f387da83563b5aeaaad91b3fec05580236d057e /toolsrc/src/vcpkg.cpp
parent5899cd1d25c134f8a30476f4939ab57952c59815 (diff)
parentfffcd0a5ae21d0b7ae0c8cdbd7bd1210f5a29031 (diff)
downloadvcpkg-c4231c51e47221345525ce68b65b28ab905087e2.tar.gz
vcpkg-c4231c51e47221345525ce68b65b28ab905087e2.zip
Merge remote-tracking branch 'upstream/master' into path_separator
Diffstat (limited to 'toolsrc/src/vcpkg.cpp')
-rw-r--r--toolsrc/src/vcpkg.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index 46ec8c013..3fdbd0d3e 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/toolsrc/src/vcpkg.cpp
@@ -125,12 +125,8 @@ static void inner(const VcpkgCmdArguments& args)
auto default_vs_path = System::get_environment_variable("VCPKG_VISUAL_STUDIO_PATH").value_or("");
-
-
- const Expected<VcpkgPaths> expected_paths = VcpkgPaths::create(vcpkg_root_dir,
- vcpkg_scripts_root_dir,
- default_vs_path,
- args.overlay_triplets.get());
+ const Expected<VcpkgPaths> expected_paths =
+ VcpkgPaths::create(vcpkg_root_dir, vcpkg_scripts_root_dir, default_vs_path, args.overlay_triplets.get());
Checks::check_exit(VCPKG_LINE_INFO,
!expected_paths.error(),
"Error: Invalid vcpkg root directory %s: %s",
@@ -143,7 +139,11 @@ static void inner(const VcpkgCmdArguments& args)
#else
const int exit_code = chdir(paths.root.c_str());
#endif
- Checks::check_exit(VCPKG_LINE_INFO, exit_code == 0, "Changing the working directory to the vcpkg root directory failed. Did you incorrectly define the VCPKG_ROOT environment variable, or did you mistakenly create a file named .vcpkg-root somewhere?");
+ Checks::check_exit(
+ VCPKG_LINE_INFO,
+ exit_code == 0,
+ "Changing the working directory to the vcpkg root directory failed. Did you incorrectly define the VCPKG_ROOT "
+ "environment variable, or did you mistakenly create a file named .vcpkg-root somewhere?");
if (args.command == "install" || args.command == "remove" || args.command == "export" || args.command == "update")
{