diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-06-30 09:31:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-30 09:31:22 -0700 |
| commit | e2049cb9754006b6a2abed781d34030e16702fad (patch) | |
| tree | 1e2f7b42436b4a3d7488b13850179bab68c0fc66 /toolsrc | |
| parent | 700a3e180c88c5fbd2ded05c25e8683278a2d33b (diff) | |
| download | vcpkg-e2049cb9754006b6a2abed781d34030e16702fad.tar.gz vcpkg-e2049cb9754006b6a2abed781d34030e16702fad.zip | |
[vcpkg_configure_cmake] Add NO_CHARSET_FLAG option (#7074)2019.06
* [vcpkg_configure_cmake] Add NO_CHARSET_FLAG option
* [vcpkg_configure_cmake] Add documentation for new NO_CHARSET_FLAG option
* [vcpkg_configure_cmake, windows toolchain] Handle NO_CHARSET_FLAG in toolchain
* [build.cpp] Add Windows toolchain to package hash
* [duilib,msix,thrift,tidy-html5] Use NO_CHARSET_FLAG to fix regressions
Diffstat (limited to 'toolsrc')
| -rw-r--r-- | toolsrc/src/vcpkg/build.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index 9694bce4c..1975d3aaf 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -1007,6 +1007,12 @@ namespace vcpkg::Build hash += "-";
hash += Hash::get_file_hash(fs, *p, "SHA1");
}
+ else if (pre_build_info.cmake_system_name.empty() ||
+ pre_build_info.cmake_system_name == "WindowsStore")
+ {
+ hash += "-";
+ hash += Hash::get_file_hash(fs, paths.scripts / "toolchains" / "windows.cmake", "SHA1");
+ }
else if (pre_build_info.cmake_system_name == "Linux")
{
hash += "-";
|