Merge branch 'master' into blender2.8
[blender.git] / CMakeLists.txt
index f4dd45d5533ecc10f04284685e00943cf4741abd..eea7876e17bc1473e89dd2c1d4f0d61d8e99ef2f 100644 (file)
@@ -405,6 +405,7 @@ option(WITH_CYCLES                                  "Enable Cycles Render Engine" ON)
 option(WITH_CYCLES_STANDALONE          "Build Cycles standalone application" OFF)
 option(WITH_CYCLES_STANDALONE_GUI      "Build Cycles standalone with GUI" OFF)
 option(WITH_CYCLES_OSL                         "Build Cycles with OSL support" ${_init_CYCLES_OSL})
+option(WITH_CYCLES_EMBREE                      "Build Cycles with Embree support" OFF)
 option(WITH_CYCLES_OPENSUBDIV          "Build Cycles with OpenSubdiv support" ${_init_CYCLES_OPENSUBDIV})
 option(WITH_CYCLES_CUDA_BINARIES       "Build Cycles CUDA binaries" OFF)
 option(WITH_CYCLES_CUBIN_COMPILER      "Build cubins with nvrtc based compiler instead of nvcc" OFF)
@@ -567,6 +568,9 @@ if(WIN32)
 
        option(WINDOWS_USE_VISUAL_STUDIO_FOLDERS "Organize the visual studio project according to source folders." ON)
        mark_as_advanced(WINDOWS_USE_VISUAL_STUDIO_FOLDERS)
+
+       option(WINDOWS_PYTHON_DEBUG "Include the files needed for debugging python scripts with visual studio 2017+." OFF)
+       mark_as_advanced(WINDOWS_PYTHON_DEBUG)
 endif()
 
 # avoid using again
@@ -1518,12 +1522,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