summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorYuhang Zhao <2546789017@qq.com>2022-01-21 15:25:46 +0800
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-01-26 01:21:08 +0000
commit574e4527b5f651acc292880c5ad5aa959ec2b2f7 (patch)
tree9d36af8b9704f752e1ebf337cca1f2e7306b4ae9 /cmake
parent8ddedab87fa22da686d73f626d7c8464aa07ab47 (diff)
Fix build with clang-cl
1. Clang-CL can't recognize "/d2FH4" and it's causing lots of warnings when compiling. So don't apply it when building with clang-cl. 2. The definition of "FS_INFORMATION_CLASS" need to be visible to clang as well. Don't know why it was excluded originally. Change-Id: I7b6e14999eea0ba1f0d73962ff03a35548f88a5a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit c532a576708254e725bf87e3b4f74d29749e709a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtFlagHandlingHelpers.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake
index b36f6cff0c..a4a989ee60 100644
--- a/cmake/QtFlagHandlingHelpers.cmake
+++ b/cmake/QtFlagHandlingHelpers.cmake
@@ -148,7 +148,7 @@ function(qt_internal_set_exceptions_flags target exceptions_on)
if(exceptions_on)
if(MSVC)
set(_flag "/EHsc")
- if(MSVC_VERSION GREATER_EQUAL 1929)
+ if((MSVC_VERSION GREATER_EQUAL 1929) AND NOT CLANG)
set(_flag ${_flag} "/d2FH4")
endif()
endif()