[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

8 files changed, 8 insertions, 4 deletions

diff --git a/ports/duilib/CONTROL b/ports/duilib/CONTROL
index 9154664ea..cb4c7ed3f 100644
--- a/ports/duilib/CONTROL
+++ b/ports/duilib/CONTROL
@@ -1,3 +1,3 @@
 Source: duilib

-Version: 2019-4-28-1

+Version: 2019-4-28-2

 Description: Duilib is a free open source DirectUI interface library under Windows. It is widely accepted by major Internet companies due to its simple and easy to expand design and stable and efficient implementation. It is widely used in IM, video client, stock market software, navigation software, and mobile phone assistive software. Duilib is still evolving, and will continue to improve in many aspects such as documentation, examples, animations, and rendering engines.

diff --git a/ports/duilib/portfile.cmake b/ports/duilib/portfile.cmake
index 7e30c9940..5556d22cd 100644
--- a/ports/duilib/portfile.cmake
+++ b/ports/duilib/portfile.cmake
@@ -16,6 +16,7 @@ vcpkg_from_github(
 vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}/DuiLib

     PREFER_NINJA

+    NO_CHARSET_FLAG

 )

 

 vcpkg_build_cmake()

diff --git a/ports/msix/CONTROL b/ports/msix/CONTROL
index ae41a6ba1..848e95be3 100644
--- a/ports/msix/CONTROL
+++ b/ports/msix/CONTROL
@@ -1,5 +1,5 @@
 Source: msix

-Version: MsixCoreInstaller-preview

+Version: MsixCoreInstaller-preview-1

 Build-Depends: xerces-c, zlib, openssl (!uwp&!windows)

 Description: The MSIX Packaging SDK project is an effort to enable developers on a variety of platforms to pack and unpack packages for the purposes of distribution from either the Microsoft Store, or their own content distribution networks.

   The MSIX Packaging APIs that a client app would use to interact with .msix/.appx packages are a subset of those documented here. See sample/ExtractContentsSample/ExtractContentsSample.cpp for additional details.

diff --git a/ports/msix/portfile.cmake b/ports/msix/portfile.cmake
index 1445e5845..7d8924ee6 100644
--- a/ports/msix/portfile.cmake
+++ b/ports/msix/portfile.cmake
@@ -31,6 +31,7 @@ endif()
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    NO_CHARSET_FLAG
     OPTIONS
         -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
         -DINSTALL_LIBMSIX=ON
diff --git a/ports/thrift/CONTROL b/ports/thrift/CONTROL
index c3f2f83c9..2ee3ef03e 100644
--- a/ports/thrift/CONTROL
+++ b/ports/thrift/CONTROL
@@ -1,5 +1,5 @@
 Source: thrift
-Version: 2019-05-07-1
+Version: 2019-05-07-2
 Build-Depends: zlib, libevent, openssl, boost-range, boost-smart-ptr, boost-date-time, boost-locale, boost-scope-exit
 Homepage: https://github.com/apache/thrift
 Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible.
diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake
index c19b38c31..c7fd84003 100644
--- a/ports/thrift/portfile.cmake
+++ b/ports/thrift/portfile.cmake
@@ -16,6 +16,7 @@ vcpkg_from_github(
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    NO_CHARSET_FLAG
     OPTIONS
         -DWITH_STDTHREADS=ON
         -DBUILD_TESTING=off
diff --git a/ports/tidy-html5/CONTROL b/ports/tidy-html5/CONTROL
index 0f608ea2d..af8276ee5 100644
--- a/ports/tidy-html5/CONTROL
+++ b/ports/tidy-html5/CONTROL
@@ -1,4 +1,4 @@
 Source: tidy-html5
-Version: 5.6.0
+Version: 5.6.0-1
 Homepage: https://github.com/htacg/tidy-html5
 Description: Tidy tidies HTML and XML. It can tidy your documents by itself, and developers can easily integrate its features into even more powerful tools.
diff --git a/ports/tidy-html5/portfile.cmake b/ports/tidy-html5/portfile.cmake
index 7cb7ca65f..e59904923 100644
--- a/ports/tidy-html5/portfile.cmake
+++ b/ports/tidy-html5/portfile.cmake
@@ -15,6 +15,7 @@ vcpkg_from_github(
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    NO_CHARSET_FLAG
     OPTIONS
         -DBUILD_SHARED_LIB=OFF
         -DTIDY_CONSOLE_SHARED=OFF