From fd6e98ba6de89a7f08364bb2ec096a5310c1cde8 Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 23 Oct 2019 11:33:44 +0200 Subject: Don't set C/C++ standards if already set Summary: Fixes regression from https://phabricator.kde.org/D24841 Reviewers: cgiboudeaux Reviewed By: cgiboudeaux Subscribers: kde-frameworks-devel, kde-buildsystem Tags: #frameworks, #build_system Differential Revision: https://phabricator.kde.org/D24882 --- kde-modules/KDECompilerSettings.cmake | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake index b5fcf661..11e7f56d 100644 --- a/kde-modules/KDECompilerSettings.cmake +++ b/kde-modules/KDECompilerSettings.cmake @@ -204,9 +204,13 @@ endif() ############################################################ # Pick sensible versions of the C and C++ standards. -set(CMAKE_C_STANDARD 90) -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED True) +if (NOT CMAKE_C_STANDARD) + set(CMAKE_C_STANDARD 90) +endif() +if (NOT CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED True) +endif() # Do not merge uninitialized global variables. # This is mostly a "principle of least surprise" thing, but also -- cgit v1.2.1