summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorKai Köhne <kai.koehne@qt.io>2021-03-16 08:30:02 +0100
committerKai Koehne <kai.koehne@qt.io>2021-03-17 07:59:35 +0000
commit78fee50e534e3a3424051066ed7dbb590b2d4f3d (patch)
tree2f8a940058c243e2d3bbb776e0ab8a1fd1eb0c5d /src/3rdparty
parentd6367aca869ee30e15a3861b2990baafb9972aa1 (diff)
MSVC: Build harfbuzz with -Zc:__cplusplus -permissive-
harfbuzz includes QtCore/qatomic.h. But the Qt headers are expected to be compiled with -Zc:__cplusplus. Change-Id: I28847844e9a00f2b7c84f0d5d7d3257eb22e2e8e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/harfbuzz-ng/CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/harfbuzz-ng/CMakeLists.txt b/src/3rdparty/harfbuzz-ng/CMakeLists.txt
index 37e07f2350..5e97a19751 100644
--- a/src/3rdparty/harfbuzz-ng/CMakeLists.txt
+++ b/src/3rdparty/harfbuzz-ng/CMakeLists.txt
@@ -65,6 +65,7 @@ qt_internal_add_3rdparty_library(BundledHarfbuzz
)
qt_disable_warnings(BundledHarfbuzz)
qt_set_symbol_visibility_hidden(BundledHarfbuzz)
+qt_set_msvc_cplusplus_options(BundledHarfbuzz PRIVATE)
#### Keys ignored in scope 1:.:.:harfbuzz-ng.pro:<TRUE>:
# OTHER_FILES = "$$PWD/src/harfbuzz.cc"