Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-11-26 13:41:38 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-11-26 13:41:38 +0300
commitacd1d1a31d1ac7343f8656dbd3b04c5342f306be (patch)
tree4345f10bb9b8b08d10b8a818f6b42f053028469a /intern
parent33750e8abbade21813365a7dd62e036969d5006c (diff)
CMake: Remove Cycles specific OpenSubdiv options
Just use one flag which enables OpenSubdiv globally for all the areas of Blender.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/CMakeLists.txt2
-rw-r--r--intern/cycles/app/CMakeLists.txt2
-rw-r--r--intern/cycles/test/CMakeLists.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index 873bbfa36fa..3028b7c67d3 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -226,7 +226,7 @@ if(WITH_CYCLES_EMBREE)
)
endif()
-if(WITH_CYCLES_OPENSUBDIV)
+if(WITH_OPENSUBDIV)
add_definitions(-DWITH_OPENSUBDIV)
include_directories(
SYSTEM
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt
index 2c1367a86dc..ee1ae90ce61 100644
--- a/intern/cycles/app/CMakeLists.txt
+++ b/intern/cycles/app/CMakeLists.txt
@@ -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)
diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt
index a2e527c7144..04894af6d6c 100644
--- a/intern/cycles/test/CMakeLists.txt
+++ b/intern/cycles/test/CMakeLists.txt
@@ -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