[Bf-blender-cvs] [a7aeaad4851] temp-remove-mingw: MinGW: Remove from CMake configs
Aaron Carlisle
noreply at git.blender.org
Mon Apr 24 01:43:06 CEST 2017
Commit: a7aeaad48516cc2a6b64cf516d35df528cd90d38
Author: Aaron Carlisle
Date: Sun Apr 23 16:56:34 2017 -0400
Branches: temp-remove-mingw
https://developer.blender.org/rBa7aeaad48516cc2a6b64cf516d35df528cd90d38
MinGW: Remove from CMake configs
===================================================================
M build_files/cmake/config/blender_full.cmake
M build_files/cmake/config/blender_release.cmake
===================================================================
diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake
index bd8a2dbaf2c..1d520b34bd4 100644
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -65,11 +65,6 @@ elseif(WIN32)
set(WITH_JACK OFF 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)
diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake
index 42e8c111714..a35b6dc124f 100644
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -66,11 +66,6 @@ elseif(WIN32)
set(WITH_JACK OFF 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)
More information about the Bf-blender-cvs
mailing list