diff options
| author | David Faure <faure@kde.org> | 2019-10-23 11:33:44 +0200 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2019-10-23 12:15:24 +0200 |
| commit | fd6e98ba6de89a7f08364bb2ec096a5310c1cde8 (patch) | |
| tree | aee7d4b96edaa7baf90257f36d7e4298946acb56 /kde-modules | |
| parent | 6e3c794e7c637141613cc180d631c9eed319a72d (diff) | |
| download | extra-cmake-modules-fd6e98ba6de89a7f08364bb2ec096a5310c1cde8.tar.gz extra-cmake-modules-fd6e98ba6de89a7f08364bb2ec096a5310c1cde8.tar.bz2 | |
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
Diffstat (limited to 'kde-modules')
| -rw-r--r-- | kde-modules/KDECompilerSettings.cmake | 10 |
1 files 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 |