From 0d7f3d01d7a1a71a58619d8714ebea9b9af256a3 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 13 Sep 2016 22:55:18 +0200 Subject: CMake: decouple WITH_CYCLES_OPENSUBDIV from WITH_OPENSUBDIV, and enable on OS X. Reviewed By: sergey Differential Revision: https://developer.blender.org/D2227 --- build_files/cmake/config/blender_full.cmake | 1 + build_files/cmake/config/blender_lite.cmake | 2 ++ build_files/cmake/macros.cmake | 6 +++--- build_files/cmake/platform/platform_apple.cmake | 9 ++++----- build_files/cmake/platform/platform_unix.cmake | 3 ++- build_files/cmake/platform/platform_win32_msvc.cmake | 2 +- 6 files changed, 13 insertions(+), 10 deletions(-) (limited to 'build_files') diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake index 634d4f431d4..cb18500c7ca 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 46b7d48b494..537134eb357 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 fabb35c539e..5a67ac981a3 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 b28b74804d3..0298f2229f8 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 1ec9b00d4ca..e33141f8012 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 4ba6f4477e6..5efda52b2c5 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) -- cgit v1.2.3