d409857781
The patch series was recreated by applying it to a CMake git checkout at v3.10.1, and then rebasing it onto v3.11.0, followed by patch resync with CMake 3.11.1 Patch 0004-Implement-Qt5-static-plugin-support.patch had to be extensively redone, to support a refactoring in the Qt5 auto-gen support in CMake 3.11.0. The rest of the patches are changed only due to artifacts of this rebasing.
26 lines
847 B
Diff
26 lines
847 B
Diff
From 7618a242db1a0a8792f0fd6b79da26a03ba883ba Mon Sep 17 00:00:00 2001
|
|
From: Ray Donnelly <mingw.android@gmail.com>
|
|
Date: Mon, 23 Jan 2017 12:46:49 +0000
|
|
Subject: [PATCH 1/8] Windows: Add missing stringapiset.h include
|
|
|
|
This is needed for WideCharToMultiByte()
|
|
---
|
|
Source/cmFileCommand.cxx | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
|
|
index d3dcc0112..05d2c6151 100644
|
|
--- a/Source/cmFileCommand.cxx
|
|
+++ b/Source/cmFileCommand.cxx
|
|
@@ -54,6 +54,7 @@ class cmSystemToolsFileTime;
|
|
using namespace cmFSPermissions;
|
|
|
|
#if defined(_WIN32)
|
|
+#include <stringapiset.h>
|
|
// libcurl doesn't support file:// urls for unicode filenames on Windows.
|
|
// Convert string from UTF-8 to ACP if this is a file:// URL.
|
|
static std::string fix_file_url_windows(const std::string& url)
|
|
--
|
|
2.16.2.windows.1
|
|
|