diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-26 14:00:36 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-26 14:00:36 +0300 |
| commit | 0970ed0550200bb743f0a7207623927d0b487c2f (patch) | |
| tree | ed55bcd50fd2a1491a0e9edf7fb82f6a60224b15 /build_files/cmake/platform | |
| parent | 3a038db576e97c0e720a92af05a218ed71ed121a (diff) | |
| parent | acd1d1a31d1ac7343f8656dbd3b04c5342f306be (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/cmake/platform')
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 3 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index bbd1b1fcac6..55642b534c2 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -59,7 +59,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}) diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 14bcf4090ad..f9ea9420e97 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -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() diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 8c3ddefa68e..5eeda2d1926 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -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 |