diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-08-08 03:46:19 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-12-30 02:07:33 +0300 |
commit | ac934efc5e0c6889012d228fb466d4739d2ebb5c (patch) | |
tree | 5e7270f7303700ba29f3d0c7e378bc1af109cc9a /build_files/build_environment/cmake/tbb.cmake | |
parent | 6a225a283ed1f3ba7a75c6c6f26d2f153bca1b58 (diff) |
Build: fix make deps TBB on Linux, older versions don't support GCC 7.
Diffstat (limited to 'build_files/build_environment/cmake/tbb.cmake')
-rw-r--r-- | build_files/build_environment/cmake/tbb.cmake | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/build_files/build_environment/cmake/tbb.cmake b/build_files/build_environment/cmake/tbb.cmake index c4055d55648..fa5c9029ed0 100644 --- a/build_files/build_environment/cmake/tbb.cmake +++ b/build_files/build_environment/cmake/tbb.cmake @@ -23,6 +23,14 @@ 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} @@ -30,7 +38,7 @@ 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/vs2010/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/${TBB_VS_VERSION}/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 ) |