[Bf-blender-cvs] [b99491caf7] master: [msvc] Set proper OpenSubdiv flags when not using find_package to find opensubdiv. Fixes T50548
lazydodo
noreply at git.blender.org
Sun Jan 29 18:00:54 CET 2017
Commit: b99491caf78f2e74bc5f87e5d36f5363910acc3d
Author: lazydodo
Date: Sun Jan 29 10:00:11 2017 -0700
Branches: master
https://developer.blender.org/rBb99491caf78f2e74bc5f87e5d36f5363910acc3d
[msvc] Set proper OpenSubdiv flags when not using find_package to find opensubdiv. Fixes T50548
===================================================================
M build_files/cmake/platform/platform_win32_msvc.cmake
===================================================================
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake b/build_files/cmake/platform/platform_win32_msvc.cmake
index 1a266df779..45a44596e6 100644
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -453,6 +453,12 @@ if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
debug ${OPENSUBDIV_LIBPATH}/osdCPU_d.lib
debug ${OPENSUBDIV_LIBPATH}/osdGPU_d.lib
)
+ set(OPENSUBDIV_HAS_OPENMP TRUE)
+ set(OPENSUBDIV_HAS_TBB FALSE)
+ set(OPENSUBDIV_HAS_OPENCL TRUE)
+ set(OPENSUBDIV_HAS_CUDA FALSE)
+ set(OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK TRUE)
+ set(OPENSUBDIV_HAS_GLSL_COMPUTE TRUE)
windows_find_package(OpenSubdiv)
endif()
More information about the Bf-blender-cvs
mailing list