diff options
Diffstat (limited to 'intern/opensubdiv/CMakeLists.txt')
| -rw-r--r-- | intern/opensubdiv/CMakeLists.txt | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/intern/opensubdiv/CMakeLists.txt b/intern/opensubdiv/CMakeLists.txt index 14cc6a70cd5..1dddd70928a 100644 --- a/intern/opensubdiv/CMakeLists.txt +++ b/intern/opensubdiv/CMakeLists.txt @@ -29,7 +29,7 @@ if(WITH_OPENSUBDIV) list(APPEND INC_SYS ${OPENSUBDIV_INCLUDE_DIRS} - ${GLEW_INCLUDE_PATH} + ${Epoxy_INCLUDE_DIRS} ) list(APPEND SRC @@ -81,14 +81,11 @@ if(WITH_OPENSUBDIV) ) endif() - OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_OPENMP) - OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_OPENCL) - OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_CUDA) - OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK) - OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_GLSL_COMPUTE) - - add_definitions(${GL_DEFINITIONS}) - add_definitions(-DOSD_USES_GLEW) + opensubdiv_define_component(OPENSUBDIV_HAS_OPENMP) + opensubdiv_define_component(OPENSUBDIV_HAS_OPENCL) + opensubdiv_define_component(OPENSUBDIV_HAS_CUDA) + opensubdiv_define_component(OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK) + opensubdiv_define_component(OPENSUBDIV_HAS_GLSL_COMPUTE) if(WIN32) add_definitions(-DNOMINMAX) @@ -113,7 +110,6 @@ if(WITH_GTESTS AND WITH_OPENSUBDIV) add_definitions(${GFLAGS_DEFINES}) add_definitions(${GLOG_DEFINES}) - add_definitions(-DBLENDER_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE}) blender_add_test_executable(opensubdiv_mesh_topology_test "internal/topology/mesh_topology_test.cc" "${INC}" "${INC_SYS}" "${LIB};bf_intern_opensubdiv") endif() |