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/tbb.cmake | |
| parent | b993e8a17a077ae23b909a9da425e72e1b16bf1a (diff) | |
build_environment: opensubdiv 3.3.3 with PR975 + TBB 2018_U5
Diffstat (limited to 'build_files/build_environment/cmake/tbb.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/tbb.cmake | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/build_files/build_environment/cmake/tbb.cmake b/build_files/build_environment/cmake/tbb.cmake index fa5c9029ed0..4e0357da8bb 100644 --- a/build_files/build_environment/cmake/tbb.cmake +++ b/build_files/build_environment/cmake/tbb.cmake @@ -23,14 +23,6 @@ set(TBB_EXTRA_ARGS -DTBB_BUILD_STATIC=On ) -if(TBB_VERSION MATCHES 2018) - set(TBB_VS_VERSION vs2013) -elseif(TBB_VERSION MATCHES 2017) - set(TBB_VS_VERSION vs2012) -else() - set(TBB_VS_VERSION vs2010) -endif() - # CMake script for TBB from https://github.com/wjakob/tbb/blob/master/CMakeLists.txt ExternalProject_Add(external_tbb URL ${TBB_URI} @@ -38,7 +30,23 @@ ExternalProject_Add(external_tbb URL_HASH MD5=${TBB_HASH} PREFIX ${BUILD_DIR}/tbb PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_tbb.txt ${BUILD_DIR}/tbb/src/external_tbb/CMakeLists.txt && - ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/tbb/src/external_tbb/build/${TBB_VS_VERSION}/version_string.ver ${BUILD_DIR}/tbb/src/external_tbb/src/tbb/version_string.ver + ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/tbb/src/external_tbb/build/vs2013/version_string.ver ${BUILD_DIR}/tbb/src/external_tbb/src/tbb/version_string.ver CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tbb ${DEFAULT_CMAKE_FLAGS} ${TBB_EXTRA_ARGS} INSTALL_DIR ${LIBDIR}/tbb ) + +if (WIN32) + if(BUILD_MODE STREQUAL Release) + ExternalProject_Add_Step(external_tbb after_install + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb.lib + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tbb/include/ ${HARVEST_TARGET}/tbb/include/ + DEPENDEES install + ) + endif() + if(BUILD_MODE STREQUAL Debug) + ExternalProject_Add_Step(external_tbb after_install + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb_debug.lib + DEPENDEES install + ) + endif() +endif() |