diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-03 16:28:18 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-04 16:44:45 -0700 |
| commit | 402552ef934d30c923e633daadc59ff853115df2 (patch) | |
| tree | 0fa81af04d846bb0ddb672767f9892bcf77728bd /toolsrc/src | |
| parent | 95428f53691d232d961bb136f35d096967d38d5f (diff) | |
| download | vcpkg-402552ef934d30c923e633daadc59ff853115df2.tar.gz vcpkg-402552ef934d30c923e633daadc59ff853115df2.zip | |
toolset_t -> Toolset
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/PostBuildLint.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/commands_build.cpp | 4 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg_paths.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/PostBuildLint.cpp index 62269a7d2..4a3308c47 100644 --- a/toolsrc/src/PostBuildLint.cpp +++ b/toolsrc/src/PostBuildLint.cpp @@ -622,7 +622,7 @@ namespace vcpkg::PostBuildLint static size_t perform_all_checks_and_return_error_count(const PackageSpec& spec, const vcpkg_paths& paths) { // for dumpbin - const toolset_t& toolset = paths.get_toolset(); + const Toolset& toolset = paths.get_toolset(); BuildInfo build_info = read_build_info(paths.build_info_file_path(spec)); const fs::path package_dir = paths.package_dir(spec); diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp index 9112e52e7..b6de8e4ea 100644 --- a/toolsrc/src/commands_build.cpp +++ b/toolsrc/src/commands_build.cpp @@ -25,7 +25,7 @@ namespace vcpkg::Commands::Build std::ofstream(binary_control_file) << bpgh; } - std::wstring make_build_env_cmd(const Triplet& target_triplet, const toolset_t& toolset) + std::wstring make_build_env_cmd(const Triplet& target_triplet, const Toolset& toolset) { return Strings::wformat(LR"("%s" %s >nul 2>&1)", toolset.vcvarsall.native(), @@ -49,7 +49,7 @@ namespace vcpkg::Commands::Build const fs::path& git_exe_path = paths.get_git_exe(); const fs::path ports_cmake_script_path = paths.ports_cmake; - const toolset_t& toolset = paths.get_toolset(); + const Toolset& toolset = paths.get_toolset(); const auto cmd_set_environment = make_build_env_cmd(target_triplet, toolset); const std::wstring cmd_launch_cmake = make_cmake_cmd(cmake_exe_path, ports_cmake_script_path, diff --git a/toolsrc/src/vcpkg_paths.cpp b/toolsrc/src/vcpkg_paths.cpp index 16ab44fd8..ece12562e 100644 --- a/toolsrc/src/vcpkg_paths.cpp +++ b/toolsrc/src/vcpkg_paths.cpp @@ -262,7 +262,7 @@ namespace vcpkg return nullopt; } - static toolset_t find_toolset_instance(const vcpkg_paths& paths) + static Toolset find_toolset_instance(const vcpkg_paths& paths) { const std::vector<std::string> vs2017_installation_instances = get_VS2017_installation_instances(paths); // Note: this will contain a mix of vcvarsall.bat locations and dumpbin.exe locations. @@ -331,7 +331,7 @@ namespace vcpkg Checks::exit_fail(VCPKG_LINE_INFO); } - const toolset_t& vcpkg_paths::get_toolset() const + const Toolset& vcpkg_paths::get_toolset() const { return this->toolset.get_lazy([this]() { return find_toolset_instance(*this); }); } |