25024b68d0
* Update to 2018.3 and improve version URLs, dependencies and patching. Improve to version -> URL translation to be algorithmic rather than manual. Make binutils build dependency explicit where appropriate because we're sensitive to the assembler used. Build's use of '-mrtm' is only patched away if it needs to be because the assembler is too old. Incorporate @adamjstewart request to convert GCC version check to a conflict. * Allow specification of C++ standard. * Improve TBB patch per PR comments. * Restrict RTM patch application to older OS only. * New version 2018_U4.
12 lines
560 B
Diff
12 lines
560 B
Diff
--- cmake/templates/TBBConfig.cmake.in~ 2018-03-30 10:55:05.000000000 -0500
|
|
+++ cmake/templates/TBBConfig.cmake.in 2018-05-25 10:25:52.498708945 -0500
|
|
@@ -52,7 +52,7 @@
|
|
|
|
@TBB_CHOOSE_COMPILER_SUBDIR@
|
|
|
|
-get_filename_component(_tbb_lib_path "${_tbb_root}/@TBB_SHARED_LIB_DIR@/${_tbb_arch_subdir}/${_tbb_compiler_subdir}" ABSOLUTE)
|
|
+get_filename_component(_tbb_lib_path "${_tbb_root}/@TBB_SHARED_LIB_DIR@" ABSOLUTE)
|
|
|
|
foreach (_tbb_component ${TBB_FIND_COMPONENTS})
|
|
set(_tbb_release_lib "${_tbb_lib_path}/@TBB_LIB_PREFIX@${_tbb_component}.@TBB_LIB_EXT@")
|