Fix T58088: OpenSubdiv not enabled by default in macOS builds.
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 27 Nov 2018 13:40:25 +0000 (14:40 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 27 Nov 2018 13:40:25 +0000 (14:40 +0100)
CMakeLists.txt
build_files/cmake/config/blender_full.cmake
build_files/cmake/config/blender_release.cmake

index b8d044a..ccc6d54 100644 (file)
@@ -184,7 +184,6 @@ elseif(WIN32)
        set(_init_JACK                           OFF)
 elseif(APPLE)
        set(_init_JACK                           OFF)
-       set(_init_OPENSUBDIV                     OFF)
 endif()
 
 
index ef9a176..9dffc01 100644 (file)
@@ -40,6 +40,7 @@ set(WITH_OPENAL              ON  CACHE BOOL "" FORCE)
 set(WITH_OPENCOLLADA         ON  CACHE BOOL "" FORCE)
 set(WITH_OPENCOLORIO         ON  CACHE BOOL "" FORCE)
 set(WITH_OPENMP              ON  CACHE BOOL "" FORCE)
+set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
 set(WITH_OPENVDB             ON  CACHE BOOL "" FORCE)
 set(WITH_OPENVDB_BLOSC       ON  CACHE BOOL "" FORCE)
 set(WITH_PYTHON_INSTALL      ON  CACHE BOOL "" FORCE)
@@ -55,13 +56,10 @@ set(WITH_MEM_JEMALLOC        ON  CACHE BOOL "" FORCE)
 if(UNIX AND NOT APPLE)
        set(WITH_JACK                ON  CACHE BOOL "" FORCE)
        set(WITH_DOC_MANPAGE         ON  CACHE BOOL "" FORCE)
-       set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
 elseif(WIN32)
        set(WITH_JACK                OFF CACHE BOOL "" FORCE)
-       set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
 elseif(APPLE)
        set(WITH_JACK                ON  CACHE BOOL "" FORCE)
-       set(WITH_OPENSUBDIV          OFF CACHE BOOL "" FORCE)
 
 #      include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
 endif()
index ef9040c..224ad05 100644 (file)
@@ -41,6 +41,7 @@ set(WITH_OPENAL              ON  CACHE BOOL "" FORCE)
 set(WITH_OPENCOLLADA         ON  CACHE BOOL "" FORCE)
 set(WITH_OPENCOLORIO         ON  CACHE BOOL "" FORCE)
 set(WITH_OPENMP              ON  CACHE BOOL "" FORCE)
+set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
 set(WITH_OPENVDB             ON  CACHE BOOL "" FORCE)
 set(WITH_OPENVDB_BLOSC       ON  CACHE BOOL "" FORCE)
 set(WITH_PYTHON_INSTALL      ON  CACHE BOOL "" FORCE)
@@ -57,13 +58,10 @@ set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61 CACHE ST
 if(UNIX AND NOT APPLE)
        set(WITH_JACK                ON  CACHE BOOL "" FORCE)
        set(WITH_DOC_MANPAGE         ON  CACHE BOOL "" FORCE)
-       set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
 elseif(WIN32)
        set(WITH_JACK                OFF CACHE BOOL "" FORCE)
-       set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
 elseif(APPLE)
        set(WITH_JACK                ON  CACHE BOOL "" FORCE)
-       set(WITH_OPENSUBDIV          OFF CACHE BOOL "" FORCE)
 
 #      include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
 endif()