summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-06-15 13:32:58 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-06-15 15:07:17 +0000
commitee21938a3a274bc3094e84d0726ad494b2db4318 (patch)
treeeccb532380dd98a96693eb455a038a46512a199a /cmake
parentb5012d9df2ef48d07f40fbf9df0e0b89e3ba8a10 (diff)
Detect win32-msvc target
Automatically set compilers based on old mkspec style target Change-Id: I80404376964a85c6b519657c054d008da47aed91 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit b62fcccb1560698dddbf5167813ae1dc044fc35b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtProcessConfigureArgs.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake
index 505673ca2c..ba056290cc 100644
--- a/cmake/QtProcessConfigureArgs.cmake
+++ b/cmake/QtProcessConfigureArgs.cmake
@@ -733,6 +733,9 @@ function(guess_compiler_from_mkspec)
elseif(mkspec MATCHES "-icc(-|$)")
set(c_compiler "icc")
set(cxx_compiler "icpc")
+ elseif(mkspec MATCHES "-msvc(-|$)")
+ set(c_compiler "cl")
+ set(cxx_compiler "cl")
endif()
if(guess_c_compiler AND NOT c_compiler STREQUAL "")
push("-DCMAKE_C_COMPILER=${c_compiler}")