Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-09-28 11:06:59 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-09-28 11:09:46 +0300
commitee1b2cce5f5c0c3c2980d91d4401a88b49e47090 (patch)
tree4a3baf4645efa04de1d57b80a6ed5a609ccf4b32 /CMakeLists.txt
parentfa6b0cdc793efe6ba84f80a38e8d3ccca7c5c7b7 (diff)
CMake: Default to C11 for Clang and GCC
The option WITH_C11 is gone, and C++ is defaulting to C++11 now, so guess it's fine to assume we need C11 now. This is technically what we use anyway, with all the re-definitions of structs (like when we typedef anonymous struct in a header file first, and them define it to a proper structure in implementation file).
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt8
1 files changed, 2 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4dd45d5533..4b9e8317e26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1518,12 +1518,8 @@ if(
(CMAKE_C_COMPILER_ID MATCHES "Clang" AND (NOT MSVC)) OR
(CMAKE_C_COMPILER_ID MATCHES "Intel")
)
- # Use C99 + GNU extensions, works with GCC, Clang, ICC
- if(WITH_C11)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
- else()
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
- endif()
+ # Use C11 + GNU extensions, works with GCC, Clang, ICC
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
endif()
# Include warnings first, so its possible to disable them with user defined flags