From b984680021c17d523313a00c6b155e1d078e4dc9 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Fri, 8 Sep 2023 12:08:09 +0200 Subject: [PATCH] Require the C++17 standard for configure-time syncqt Require the C++17 standard, but not what is set by Qt for syncqt, to avoid unwanted standard check in some corner cases. Pick-to: 6.5 Task-number: QTBUG-116789 Change-Id: I34e07e172e31d5ffc69b84dd3ef30f02f6e75a9d Reviewed-by: Alexandru Croitor Reviewed-by: Qt CI Bot (cherry picked from commit 7a70c6fcfd5d3e000b80ab9b833f4e2b14a3563d) Reviewed-by: Qt Cherry-pick Bot --- src/tools/syncqt/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/syncqt/CMakeLists.txt b/src/tools/syncqt/CMakeLists.txt index 668975c3db1..3e1f35c3878 100644 --- a/src/tools/syncqt/CMakeLists.txt +++ b/src/tools/syncqt/CMakeLists.txt @@ -60,7 +60,7 @@ else() INSTALL_DIRECTORY "${INSTALL_LIBEXECDIR}" CMAKE_FLAGS -DCMAKE_CXX_STANDARD_REQUIRED:BOOL=TRUE - -DCMAKE_CXX_STANDARD:STRING=${CMAKE_CXX_STANDARD} + -DCMAKE_CXX_STANDARD:STRING=17 # std::filesystem API is only available in macOS 10.15+ -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.15 "${osx_architectures}"