aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2021-06-27 00:52:00 +0200
committerAlbert Astals Cid <aacid@kde.org>2021-06-27 00:52:00 +0200
commit31c283646a57f366d02db4d2a2a290f462570294 (patch)
treecc9093b196aaf82a796b6c28ebd38d9391f086bf
parent9e63248b1a9931fbb66307c7dcbe9a9759f81e40 (diff)
downloadextra-cmake-modules-31c283646a57f366d02db4d2a2a290f462570294.tar.gz
extra-cmake-modules-31c283646a57f366d02db4d2a2a290f462570294.tar.bz2
cmake: Explicetely disable c/c++ compiler extensions
We're a multi-compiler project, so disable compiler specific extensions
-rw-r--r--kde-modules/KDECompilerSettings.cmake2
-rw-r--r--kde-modules/KDEFrameworkCompilerSettings.cmake1
2 files changed, 3 insertions, 0 deletions
diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake
index aa5b3e15..78e5289f 100644
--- a/kde-modules/KDECompilerSettings.cmake
+++ b/kde-modules/KDECompilerSettings.cmake
@@ -185,10 +185,12 @@ endif()
# Pick sensible versions of the C and C++ standards.
if (NOT CMAKE_C_STANDARD)
set(CMAKE_C_STANDARD 90)
+ set(CMAKE_C_EXTENSIONS OFF)
endif()
if (NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED True)
+ set(CMAKE_CXX_EXTENSIONS OFF)
endif()
# Do not merge uninitialized global variables.
diff --git a/kde-modules/KDEFrameworkCompilerSettings.cmake b/kde-modules/KDEFrameworkCompilerSettings.cmake
index 9159c217..264e715c 100644
--- a/kde-modules/KDEFrameworkCompilerSettings.cmake
+++ b/kde-modules/KDEFrameworkCompilerSettings.cmake
@@ -33,6 +33,7 @@ if (NOT CMAKE_CXX_STANDARD)
if (ECM_GLOBAL_FIND_VERSION VERSION_GREATER_EQUAL 5.84.0)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED True)
+ set(CMAKE_CXX_EXTENSIONS OFF)
endif()
endif()