summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorCristian Adam <cristian.adam@qt.io>2019-11-22 17:11:22 +0100
committerCristian Adam <cristian.adam@qt.io>2019-11-22 17:06:18 +0000
commitf4efaf54d552d4ab4601119a6bc6d2991c82888d (patch)
tree853a3c9659478409f9c59fb88981dd92ead86c84 /cmake
parent1962a86b20d3bba1151fe51dd7c2600330d2d614 (diff)
CMake: Add support for building with Clang-MinGW toolchain
Clang doesn't have a mkspec just a win32-clang, there is win32-clang-g++ and win32-clang-msvc. Change-Id: Iff521e955559dfb2308e377b41e86b3f62c42e70 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtBuild.cmake7
1 files changed, 5 insertions, 2 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index 68729fe351..f51e84b19a 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -101,10 +101,13 @@ if(WIN32)
endif()
if(MSVC)
set(QT_QMAKE_TARGET_MKSPEC win32-msvc)
- elseif(CLANG)
- set(QT_QMAKE_TARGET_MKSPEC win32-clang)
+ elseif(CLANG AND MINGW)
+ set(QT_QMAKE_TARGET_MKSPEC win32-clang-g++)
elseif(MINGW)
set(QT_QMAKE_TARGET_MKSPEC win32-g++)
+ endif()
+
+ if (MINGW)
list(APPEND QT_DEFAULT_PLATFORM_DEFINITIONS _WIN32_WINNT=0x0601)
endif()
elseif(LINUX)