[Bf-blender-cvs] [a47bfe7] master: Experimental option to build Blender with C11 support
Sergey Sharybin
noreply at git.blender.org
Thu Mar 3 07:35:15 CET 2016
Commit: a47bfe7d4083b75212d24efb43b7d07f2d696913
Author: Sergey Sharybin
Date: Fri Jan 29 17:43:40 2016 +0100
Branches: master
https://developer.blender.org/rBa47bfe7d4083b75212d24efb43b7d07f2d696913
Experimental option to build Blender with C11 support
It'll be nice to eventually go C11/C++11 by default, but for until
then it's kinda handy to be able to build locally with C11 support,
Reviewers: mont29, campbellbarton
Reviewed By: mont29, campbellbarton
Differential Revision: https://developer.blender.org/D1752
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 237f361..7a387be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -467,7 +467,9 @@ if(WIN32)
set(CPACK_INSTALL_PREFIX ${CMAKE_GENERIC_PROGRAM_FILES}/${})
endif()
-# Experimental support of C++11
+# Experimental support of C11 and C++11
+option(WITH_C11 "Build with C11 standard enabled, for development use only!" OFF)
+mark_as_advanced(WITH_C11)
option(WITH_CPP11 "Build with C++11 standard enabled, for development use only!" OFF)
mark_as_advanced(WITH_CPP11)
@@ -2903,7 +2905,11 @@ endif()
# Visual Studio has all standards it supports available by default
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_COMPILER_ID MATCHES "Intel")
# Use C99 + GNU extensions, works with GCC, Clang, ICC
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+ if(WITH_C11)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
+ else()
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+ endif()
endif()
# Include warnings first, so its possible to disable them with user defined flags
More information about the Bf-blender-cvs
mailing list