CMake: Remove Cycles specific OpenSubdiv options
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 26 Nov 2018 10:41:38 +0000 (11:41 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 26 Nov 2018 10:41:38 +0000 (11:41 +0100)
Just use one flag which enables OpenSubdiv globally for all the
areas of Blender.

CMakeLists.txt
build_files/cmake/config/blender_full.cmake
build_files/cmake/config/blender_lite.cmake
build_files/cmake/config/blender_release.cmake
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_apple.cmake
build_files/cmake/platform/platform_unix.cmake
build_files/cmake/platform/platform_win32.cmake
intern/cycles/CMakeLists.txt
intern/cycles/app/CMakeLists.txt
intern/cycles/test/CMakeLists.txt

index eb8df07..dfeb1d6 100644 (file)
@@ -157,7 +157,6 @@ option_defaults_init(
        _init_BUILDINFO
        _init_CODEC_FFMPEG
        _init_CYCLES_OSL
-       _init_CYCLES_OPENSUBDIV
        _init_IMAGE_OPENEXR
        _init_INPUT_NDOF
        _init_JACK
@@ -175,7 +174,6 @@ if(UNIX AND NOT APPLE)
        # disable less important dependencies by default
        set(_init_CODEC_FFMPEG                   OFF)
        set(_init_CYCLES_OSL                     OFF)
-       set(_init_CYCLES_OPENSUBDIV              OFF)
        set(_init_IMAGE_OPENEXR                  OFF)
        set(_init_JACK                           OFF)
        set(_init_OPENCOLLADA                    OFF)
@@ -406,7 +404,6 @@ 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)
 option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF)
index e38d178..c5d8c34 100644 (file)
@@ -12,7 +12,6 @@ set(WITH_CODEC_FFMPEG        ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_SNDFILE       ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES              ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_OSL          ON  CACHE BOOL "" FORCE)
-set(WITH_CYCLES_OPENSUBDIV   ON  CACHE BOOL "" FORCE)
 set(WITH_FFTW3               ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV               ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)
index 1a5e6a3..5d53a50 100644 (file)
@@ -17,7 +17,6 @@ set(WITH_CODEC_FFMPEG        OFF CACHE BOOL "" FORCE)
 set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
 set(WITH_CYCLES              OFF CACHE BOOL "" FORCE)
 set(WITH_CYCLES_OSL          OFF CACHE BOOL "" FORCE)
-set(WITH_CYCLES_OPENSUBDIV   OFF CACHE BOOL "" FORCE)
 set(WITH_FFTW3               OFF CACHE BOOL "" FORCE)
 set(WITH_LIBMV               OFF CACHE BOOL "" FORCE)
 set(WITH_LLVM                OFF CACHE BOOL "" FORCE)
index f475bb0..23d6b55 100644 (file)
@@ -13,7 +13,6 @@ set(WITH_CODEC_FFMPEG        ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_SNDFILE       ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES              ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_OSL          ON  CACHE BOOL "" FORCE)
-set(WITH_CYCLES_OPENSUBDIV   ON  CACHE BOOL "" FORCE)
 set(WITH_FFTW3               ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV               ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)
index 0143335..07c8879 100644 (file)
@@ -431,7 +431,7 @@ function(setup_liblinks
        if(WITH_OPENCOLORIO)
                target_link_libraries(${target} ${OPENCOLORIO_LIBRARIES})
        endif()
-       if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
+       if(WITH_OPENSUBDIV)
                        target_link_libraries(${target} ${OPENSUBDIV_LIBRARIES})
        endif()
        if(WITH_OPENVDB)
@@ -763,7 +763,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
                list(APPEND BLENDER_SORTED_LIBS bf_intern_gpudirect)
        endif()
 
-       if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
+       if(WITH_OPENSUBDIV)
                list(APPEND BLENDER_SORTED_LIBS bf_intern_opensubdiv)
        endif()
 
index b57c351..4e78737 100644 (file)
@@ -57,7 +57,7 @@ if(WITH_ALEMBIC)
        set(ALEMBIC_FOUND ON)
 endif()
 
-if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
+if(WITH_OPENSUBDIV)
        set(OPENSUBDIV ${LIBDIR}/opensubdiv)
        set(OPENSUBDIV_LIBPATH ${OPENSUBDIV}/lib)
        find_library(OSD_LIB_CPU NAMES osdCPU PATHS ${OPENSUBDIV_LIBPATH})
index 6880296..ff4c31d 100644 (file)
@@ -390,7 +390,7 @@ if(WITH_LLVM OR WITH_SDL_DYNLOAD)
        )
 endif()
 
-if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
+if(WITH_OPENSUBDIV)
        find_package_wrapper(OpenSubdiv)
 
        set(OPENSUBDIV_LIBRARIES ${OPENSUBDIV_LIBRARIES})
@@ -398,7 +398,6 @@ if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
 
        if(NOT OPENSUBDIV_FOUND)
                set(WITH_OPENSUBDIV OFF)
-               set(WITH_CYCLES_OPENSUBDIV OFF)
                message(STATUS "OpenSubdiv not found")
        endif()
 endif()
index d5d0b03..4c15bd6 100644 (file)
@@ -502,7 +502,7 @@ if(WITH_IMAGE_OPENJPEG)
        set(OPENJPEG_LIBRARIES ${OPENJPEG}/lib/openjp2.lib)
 endif()
 
-if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
+if(WITH_OPENSUBDIV)
        set(OPENSUBDIV_INCLUDE_DIR ${LIBDIR}/opensubdiv/include)
        set(OPENSUBDIV_LIBPATH ${LIBDIR}/opensubdiv/lib)
        set(OPENSUBDIV_LIBRARIES
index 873bbfa..3028b7c 100644 (file)
@@ -226,7 +226,7 @@ if(WITH_CYCLES_EMBREE)
        )
 endif()
 
-if(WITH_CYCLES_OPENSUBDIV)
+if(WITH_OPENSUBDIV)
        add_definitions(-DWITH_OPENSUBDIV)
        include_directories(
                SYSTEM
index 2c1367a..ee1ae90 100644 (file)
@@ -80,7 +80,7 @@ macro(cycles_target_link_libraries target)
        if(WITH_CYCLES_EMBREE)
                target_link_libraries(${target} ${EMBREE_LIBRARIES})
        endif()
-       if(WITH_CYCLES_OPENSUBDIV)
+       if(WITH_OPENSUBDIV)
                target_link_libraries(${target} ${OPENSUBDIV_LIBRARIES})
        endif()
        if(WITH_OPENCOLORIO)
index a2e527c..04894af 100644 (file)
@@ -50,7 +50,7 @@ endif()
 if(WITH_IMAGE_OPENJPEG)
        list(APPEND ALL_CYCLES_LIBRARIES ${OPENJPEG_LIBRARIES})
 endif()
-if(WITH_CYCLES_OPENSUBDIV)
+if(WITH_OPENSUBDIV)
        add_definitions(-DWITH_OPENSUBDIV)
        include_directories(
                SYSTEM