aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/include/vcpkg_System.h
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-10-12 11:22:25 -0700
committerGitHub <noreply@github.com>2017-10-12 11:22:25 -0700
commit85e6b1b36e734c0db50464b07b77589d63c3c875 (patch)
tree095289838517a64f06298b1a05ded47a7139d7d9 /toolsrc/include/vcpkg_System.h
parentd7a313c5c356e1641f18cd14ad0ac0c3901bc0bf (diff)
parent9c3f9582fb4541a59e4282269e4f6c9c7debcc3e (diff)
downloadvcpkg-85e6b1b36e734c0db50464b07b77589d63c3c875.tar.gz
vcpkg-85e6b1b36e734c0db50464b07b77589d63c3c875.zip
Merge branch 'master' into vtk-components
Diffstat (limited to 'toolsrc/include/vcpkg_System.h')
-rw-r--r--toolsrc/include/vcpkg_System.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/toolsrc/include/vcpkg_System.h b/toolsrc/include/vcpkg_System.h
index 32da6e39c..65f80ae6d 100644
--- a/toolsrc/include/vcpkg_System.h
+++ b/toolsrc/include/vcpkg_System.h
@@ -23,7 +23,7 @@ namespace vcpkg::System
ExitCodeAndOutput cmd_execute_and_capture_output(const CWStringView cmd_line);
- std::wstring create_powershell_script_cmd(const fs::path& script_path, const CWStringView args = L"");
+ std::wstring create_powershell_script_cmd(const fs::path& script_path, const CWStringView args = Strings::WEMPTY);
enum class Color
{
@@ -32,6 +32,7 @@ namespace vcpkg::System
warning = 14,
};
+ void println();
void print(const CStringView message);
void println(const CStringView message);
void print(const Color c, const CStringView message);
@@ -79,9 +80,9 @@ namespace vcpkg::System
std::vector<CPUArchitecture> get_supported_host_architectures();
- const fs::path& get_ProgramFiles_32_bit();
+ const fs::path& get_program_files_32_bit();
- const fs::path& get_ProgramFiles_platform_bitness();
+ const fs::path& get_program_files_platform_bitness();
}
namespace vcpkg::Debug