32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From 67803fa3106cff4daefbdfd872045ca9cc7f4569 Mon Sep 17 00:00:00 2001
|
|
From: derrod <dennis@obsproject.com>
|
|
Date: Mon, 17 Apr 2023 03:42:56 +0200
|
|
Subject: [PATCH] cmake: Set C11 for CMake < 3.21
|
|
|
|
---
|
|
cmake/Modules/CompilerConfig.cmake | 11 +++++++++--
|
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/cmake/Modules/CompilerConfig.cmake b/cmake/Modules/CompilerConfig.cmake
|
|
index 763490008c848..41c56da8b4cee 100644
|
|
--- a/cmake/Modules/CompilerConfig.cmake
|
|
+++ b/cmake/Modules/CompilerConfig.cmake
|
|
@@ -5,8 +5,15 @@ set(CMAKE_CXX_STANDARD 17)
|
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
set(CMAKE_CXX_EXTENSIONS OFF)
|
|
|
|
-set(CMAKE_C_STANDARD 17)
|
|
-set(CMAKE_C_STANDARD_REQUIRED ON)
|
|
+# CMake < 3.21 only goes up to 11, but it's mostly identical to 17 anyway.
|
|
+if(${CMAKE_VERSION} VERSION_LESS "3.21.0")
|
|
+ set(CMAKE_C_STANDARD 11)
|
|
+ set(CMAKE_C_STANDARD_REQUIRED ON)
|
|
+else()
|
|
+ set(CMAKE_C_STANDARD 17)
|
|
+ set(CMAKE_C_STANDARD_REQUIRED ON)
|
|
+endif()
|
|
+
|
|
# TODO/FIXME: Investigate disabling C extensions on Linux/POSIX
|
|
if(OS_MACOS OR NOT OS_POSIX)
|
|
set(CMAKE_C_EXTENSIONS OFF)
|