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
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2018-08-19 20:29:55 +0300
committerRay Molenkamp <github@lazydodo.com>2018-08-19 20:44:46 +0300
commit0a08ad8636ca6f73c08539c2ff096798f6a67868 (patch)
treea275cb12593785dafa191b5c909e7b48598e7fdb /build_files
parentf4c9bdb022cd52f355c06f1e753fe3e5acbdabee (diff)
build_environment: opensubdiv windows build fixes.
only build cuda on 64 bit, since 32 bit is no longer supported by nvcc
Diffstat (limited to 'build_files')
-rw-r--r--build_files/build_environment/cmake/opensubdiv.cmake13
1 files changed, 12 insertions, 1 deletions
diff --git a/build_files/build_environment/cmake/opensubdiv.cmake b/build_files/build_environment/cmake/opensubdiv.cmake
index 1db3b11de9a..18b51f57225 100644
--- a/build_files/build_environment/cmake/opensubdiv.cmake
+++ b/build_files/build_environment/cmake/opensubdiv.cmake
@@ -35,7 +35,6 @@ set(OPENSUBDIV_EXTRA_ARGS
if(WIN32)
set(OPENSUBDIV_EXTRA_ARGS
${OPENSUBDIV_EXTRA_ARGS}
- -DNO_CUDA=Off
-DTBB_INCLUDE_DIR=${LIBDIR}/tbb/include
-DTBB_LIBRARIES=${LIBDIR}/tbb/lib/tbb_static.lib
-DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL
@@ -44,6 +43,18 @@ if(WIN32)
-DCUEW_LIBRARY=${LIBDIR}/cuew/lib/cuew${LIBEXT}
-DCMAKE_EXE_LINKER_FLAGS_RELEASE=libcmt.lib
)
+ if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+ set(OPENSUBDIV_EXTRA_ARGS
+ ${OPENSUBDIV_EXTRA_ARGS}
+ -DNO_CUDA=OFF
+ )
+ else()
+ set(OPENSUBDIV_EXTRA_ARGS
+ ${OPENSUBDIV_EXTRA_ARGS}
+ -DNO_CUDA=ON
+ )
+ endif()
+
else()
set(OPENSUBDIV_EXTRA_ARGS
${OPENSUBDIV_EXTRA_ARGS}