diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-01-29 09:42:31 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-01-29 11:41:26 +0100 |
| commit | 6666e6be6b9cd0c53e73bb799f51d4c4a7b3dbba (patch) | |
| tree | da6579318eefea5a5ad7227de8abf17a4e1396d8 | |
| parent | 621c56d260d6ca6a5fbef8a91928e1bdd560a000 (diff) | |
Fix MSVC static buildv6.0.1
The precompiled header of the MSVC static build is not compatible with
the compiler flags we set on open62541.c. Turn off precompiled headers
for this file.
Pick-to: dev
Task-number: QTBUG-90531
Change-Id: I046346534d171e08cee2360697d4be42b78da653
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
| -rw-r--r-- | src/plugins/opcua/open62541/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/opcua/open62541/CMakeLists.txt b/src/plugins/opcua/open62541/CMakeLists.txt index 8f94da5..f862f3b 100644 --- a/src/plugins/opcua/open62541/CMakeLists.txt +++ b/src/plugins/opcua/open62541/CMakeLists.txt @@ -89,10 +89,10 @@ if (QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541) "-Wno-unused-parameter;-Wno-unused-function;-Wno-format;-Wno-strict-aliasing;-Wno-unused-result;-std=c99") elseif(WIN32 AND MSVC) # CMake uses C11+ by default and the _Static_assert expansion fails during compilation - set_source_files_properties(../../../3rdparty/open62541/open62541.c PROPERTIES LANGUAGE CXX) set_source_files_properties(../../../3rdparty/open62541/open62541.c PROPERTIES - COMPILE_OPTIONS - "/Zc:strictStrings-;/permissive;/wd2362") + LANGUAGE CXX + SKIP_PRECOMPILE_HEADERS ON + COMPILE_OPTIONS "/Zc:strictStrings-;/permissive;/wd2362") endif() endif() # special case end |