diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtFlagHandlingHelpers.cmake | 4 | ||||
| -rw-r--r-- | cmake/QtPublicTargetsHelpers.cmake | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake index b9835a3639..250df5de2d 100644 --- a/cmake/QtFlagHandlingHelpers.cmake +++ b/cmake/QtFlagHandlingHelpers.cmake @@ -228,11 +228,11 @@ function(qt_set_language_standards_interface_compile_features target) target_compile_features("${target}" INTERFACE ${cpp_feature}) endfunction() -function(qt_enable_msvc_cplusplus_define target visibility) +function(qt_set_msvc_cplusplus_options target visibility) # For MSVC we need to explicitly pass -Zc:__cplusplus to get correct __cplusplus. # Check qt_config_compile_test for more info. if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND MSVC_VERSION GREATER_EQUAL 1913) - target_compile_options("${target}" ${visibility} "-Zc:__cplusplus") + target_compile_options("${target}" ${visibility} "-Zc:__cplusplus" "-permissive-") endif() endfunction() diff --git a/cmake/QtPublicTargetsHelpers.cmake b/cmake/QtPublicTargetsHelpers.cmake index 8d916535ac..2e5eb564f4 100644 --- a/cmake/QtPublicTargetsHelpers.cmake +++ b/cmake/QtPublicTargetsHelpers.cmake @@ -20,7 +20,7 @@ function(qt_internal_setup_public_platform_target) target_link_libraries(Platform INTERFACE log) endif() - qt_enable_msvc_cplusplus_define(Platform INTERFACE) + qt_set_msvc_cplusplus_options(Platform INTERFACE) # Propagate minimum C++ 17 via Platform to Qt consumers (apps), after the global features # are computed. |