Commit: 0d7f3d01d7a1a71a58619d8714ebea9b9af256a3 Author: Brecht Van Lommel Date: Tue Sep 13 22:55:18 2016 +0200 Branches: blender-v2.78-release https://developer.blender.org/rB0d7f3d01d7a1a71a58619d8714ebea9b9af256a3
CMake: decouple WITH_CYCLES_OPENSUBDIV from WITH_OPENSUBDIV, and enable on OS X. Reviewed By: sergey Differential Revision: https://developer.blender.org/D2227 =================================================================== M CMakeLists.txt M build_files/cmake/config/blender_full.cmake M build_files/cmake/config/blender_lite.cmake M build_files/cmake/macros.cmake M build_files/cmake/platform/platform_apple.cmake M build_files/cmake/platform/platform_unix.cmake M build_files/cmake/platform/platform_win32_msvc.cmake =================================================================== diff --git a/CMakeLists.txt b/CMakeLists.txt index 352712e..e061fab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -155,6 +155,7 @@ option_defaults_init( _init_BUILDINFO _init_CODEC_FFMPEG _init_CYCLES_OSL + _init_CYCLES_OPENSUBDIV _init_IMAGE_OPENEXR _init_INPUT_NDOF _init_JACK @@ -172,6 +173,7 @@ 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) @@ -400,7 +402,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_OPENSUBDIV "Build Cycles with OpenSubdiv support" ON) +option(WITH_CYCLES_OPENSUBDIV "Build Cycles with OpenSubdiv support" ${_init_CYCLES_OPENSUBDIV}) option(WITH_CYCLES_CUDA_BINARIES "Build Cycles CUDA binaries" OFF) set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_37 sm_50 sm_52 CACHE STRING "CUDA architectures to build binaries for") mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH) @@ -952,11 +954,6 @@ if(WITH_CYCLES) ) endif() endif() - - if(WITH_CYCLES_OPENSUBDIV AND NOT WITH_OPENSUBDIV) - message(STATUS "WITH_CYCLES_OPENSUBDIV requires WITH_OPENSUBDIV to be ON, turning OFF") - set(WITH_CYCLES_OPENSUBDIV OFF) - endif() endif() if(WITH_INTERNATIONAL) diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake index 634d4f4..cb18500 100644 --- a/build_files/cmake/config/blender_full.cmake +++ b/build_files/cmake/config/blender_full.cmake @@ -12,6 +12,7 @@ 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) diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake index 46b7d48..537134e 100644 --- a/build_files/cmake/config/blender_lite.cmake +++ b/build_files/cmake/config/blender_lite.cmake @@ -16,6 +16,7 @@ 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) @@ -48,6 +49,7 @@ set(WITH_OPENCOLLADA OFF CACHE BOOL "" FORCE) set(WITH_OPENCOLORIO OFF CACHE BOOL "" FORCE) set(WITH_OPENIMAGEIO OFF CACHE BOOL "" FORCE) set(WITH_OPENMP OFF CACHE BOOL "" FORCE) +set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE) set(WITH_OPENVDB OFF CACHE BOOL "" FORCE) set(WITH_RAYOPTIMIZATION OFF CACHE BOOL "" FORCE) set(WITH_SDL OFF CACHE BOOL "" FORCE) diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index fabb35c..5a67ac9 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -415,7 +415,7 @@ function(setup_liblinks if(WITH_OPENCOLORIO) target_link_libraries(${target} ${OPENCOLORIO_LIBRARIES}) endif() - if(WITH_OPENSUBDIV) + if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV) if(WIN32 AND NOT UNIX) file_list_suffix(OPENSUBDIV_LIBRARIES_DEBUG "${OPENSUBDIV_LIBRARIES}" "_d") target_link_libraries_debug(${target} "${OPENSUBDIV_LIBRARIES_DEBUG}") @@ -745,7 +745,7 @@ function(SETUP_BLENDER_SORTED_LIBS) list(APPEND BLENDER_SORTED_LIBS bf_intern_gpudirect) endif() - if(WITH_OPENSUBDIV) + if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV) list(APPEND BLENDER_SORTED_LIBS bf_intern_opensubdiv) endif() @@ -1600,4 +1600,4 @@ MACRO(WINDOWS_SIGN_TARGET target) ) endif() endif() -ENDMACRO() \ No newline at end of file +ENDMACRO() diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index b28b748..0298f22 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -50,15 +50,14 @@ if(WITH_ALEMBIC) set(ALEMBIC_LIBRARIES Alembic) endif() -if(WITH_OPENSUBDIV) +if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV) set(OPENSUBDIV ${LIBDIR}/opensubdiv) set(OPENSUBDIV_LIBPATH ${OPENSUBDIV}/lib) - find_library(OSL_LIB_UTIL NAMES osdutil PATHS ${OPENSUBDIV_LIBPATH}) - find_library(OSL_LIB_CPU NAMES osdCPU PATHS ${OPENSUBDIV_LIBPATH}) - find_library(OSL_LIB_GPU NAMES osdGPU PATHS ${OPENSUBDIV_LIBPATH}) + find_library(OSD_LIB_CPU NAMES osdCPU PATHS ${OPENSUBDIV_LIBPATH}) + find_library(OSD_LIB_GPU NAMES osdGPU PATHS ${OPENSUBDIV_LIBPATH}) set(OPENSUBDIV_INCLUDE_DIR ${OPENSUBDIV}/include) set(OPENSUBDIV_INCLUDE_DIRS ${OPENSUBDIV_INCLUDE_DIR}) - list(APPEND OPENSUBDIV_LIBRARIES ${OSL_LIB_UTIL} ${OSL_LIB_CPU} ${OSL_LIB_GPU}) + list(APPEND OPENSUBDIV_LIBRARIES ${OSD_LIB_CPU} ${OSD_LIB_GPU}) endif() if(WITH_JACK) diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 1ec9b00..e33141f 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -344,7 +344,7 @@ if(WITH_LLVM OR WITH_SDL_DYNLOAD) ) endif() -if(WITH_OPENSUBDIV) +if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV) find_package_wrapper(OpenSubdiv) set(OPENSUBDIV_LIBRARIES ${OPENSUBDIV_LIBRARIES}) @@ -352,6 +352,7 @@ if(WITH_OPENSUBDIV) if(NOT OPENSUBDIV_FOUND) set(WITH_OPENSUBDIV OFF) + set(WITH_CYCLES_OPENSUBDIV OFF) message(STATUS "OpenSubdiv not found") endif() endif() diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake b/build_files/cmake/platform/platform_win32_msvc.cmake index 4ba6f44..5efda52 100644 --- a/build_files/cmake/platform/platform_win32_msvc.cmake +++ b/build_files/cmake/platform/platform_win32_msvc.cmake @@ -442,7 +442,7 @@ if(WITH_MOD_CLOTH_ELTOPO) ) endif() -if(WITH_OPENSUBDIV) +if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV) set(OPENSUBDIV_INCLUDE_DIR ${LIBDIR}/opensubdiv/include) set(OPENSUBDIV_LIBPATH ${LIBDIR}/opensubdiv/lib) set(OPENSUBDIV_LIBRARIES ${OPENSUBDIV_LIBPATH}/osdCPU.lib ${OPENSUBDIV_LIBPATH}/osdGPU.lib) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
