[Bf-blender-cvs] [58cf332] master: CMake: Disable some features when using MinGW and full cmake config
Sergey Sharybin
noreply at git.blender.org
Sat Dec 26 16:08:20 CET 2015
Commit: 58cf3327e481cea3dbd2c1c0b89b02d4d2ca7be4
Author: Sergey Sharybin
Date: Sat Dec 26 20:07:40 2015 +0500
Branches: master
https://developer.blender.org/rB58cf3327e481cea3dbd2c1c0b89b02d4d2ca7be4
CMake: Disable some features when using MinGW and full cmake config
===================================================================
M build_files/cmake/config/blender_full.cmake
===================================================================
diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake
index ad8a681..5903eb9 100644
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -60,10 +60,16 @@ if(UNIX AND NOT APPLE)
set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE)
elseif(WIN32)
set(WITH_JACK OFF CACHE BOOL "" FORCE)
- set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE)
+ if(NOT CMAKE_COMPILER_IS_GNUCC)
+ set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE)
+ else()
+ # MinGW exceptions
+ set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE)
+ set(WITH_CODEC_SNDFILE OFF CACHE BOOL "" FORCE)
+ set(WITH_CYCLES_OSL OFF CACHE BOOL "" FORCE)
+ endif()
elseif (APPLE)
set(WITH_JACK ON CACHE BOOL "" FORCE)
set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE)
set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE)
endif()
-
More information about the Bf-blender-cvs
mailing list