From 78fee50e534e3a3424051066ed7dbb590b2d4f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Tue, 16 Mar 2021 08:30:02 +0100 Subject: 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 Reviewed-by: Giuseppe D'Angelo Reviewed-by: Thiago Macieira --- src/3rdparty/harfbuzz-ng/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'src/3rdparty') 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:: # OTHER_FILES = "$$PWD/src/harfbuzz.cc" -- cgit v1.2.3