diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-08-14 04:08:28 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-08-14 04:08:28 +0300 |
| commit | fee32abee977c3d44c0ea7d098441d6261f51d3d (patch) | |
| tree | d42c08444b7c6d6cb843a1cbce92c95833bf3c1a /build_files/build_environment/cmake/opensubdiv.cmake | |
| parent | b993e8a17a077ae23b909a9da425e72e1b16bf1a (diff) | |
build_environment: opensubdiv 3.3.3 with PR975 + TBB 2018_U5
Diffstat (limited to 'build_files/build_environment/cmake/opensubdiv.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/opensubdiv.cmake | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/build_files/build_environment/cmake/opensubdiv.cmake b/build_files/build_environment/cmake/opensubdiv.cmake index 930ef4e6ed3..1db3b11de9a 100644 --- a/build_files/build_environment/cmake/opensubdiv.cmake +++ b/build_files/build_environment/cmake/opensubdiv.cmake @@ -33,16 +33,11 @@ set(OPENSUBDIV_EXTRA_ARGS ) if(WIN32) - #no cuda support for vc15 yet - if(msvc15) - set(OPENSUBDIV_CUDA ON) - else() - set(OPENSUBDIV_CUDA ON) - endif() - set(OPENSUBDIV_EXTRA_ARGS ${OPENSUBDIV_EXTRA_ARGS} - -DNO_CUDA=${OPENSUBDIV_CUDA} + -DNO_CUDA=Off + -DTBB_INCLUDE_DIR=${LIBDIR}/tbb/include + -DTBB_LIBRARIES=${LIBDIR}/tbb/lib/tbb_static.lib -DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL -DCLEW_LIBRARY=${LIBDIR}/clew/lib/clew${LIBEXT} -DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include @@ -69,10 +64,28 @@ ExternalProject_Add(external_opensubdiv INSTALL_DIR ${LIBDIR}/opensubdiv ) +if(WIN32) + if(BUILD_MODE STREQUAL Release) + ExternalProject_Add_Step(external_opensubdiv after_install + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opensubdiv/lib ${HARVEST_TARGET}/opensubdiv/lib + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opensubdiv/include ${HARVEST_TARGET}/opensubdiv/include + DEPENDEES install + ) + endif() + if(BUILD_MODE STREQUAL Debug) + ExternalProject_Add_Step(external_opensubdiv after_install + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opensubdiv/lib/osdCPU.lib ${HARVEST_TARGET}/opensubdiv/lib/osdCPU_d.lib + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opensubdiv/lib/osdGPU.lib ${HARVEST_TARGET}/opensubdiv/lib/osdGPU_d.lib + DEPENDEES install + ) + endif() +endif() + add_dependencies( external_opensubdiv external_glew external_glfw external_clew external_cuew + external_tbb ) |