|
Line
Link Here
|
| 0 |
-- a/cmake/modules/FindTBB.cmake |
0 |
++ b/cmake/modules/FindTBB.cmake |
|
Lines 196-206
if(NOT TBB_FOUND)
Link Here
|
| 196 |
|
196 |
|
| 197 |
if(TBB_INCLUDE_DIRS) |
197 |
if(TBB_INCLUDE_DIRS) |
| 198 |
if (EXISTS "${TBB_INCLUDE_DIRS}/tbb/tbb_stddef.h") |
198 |
if (EXISTS "${TBB_INCLUDE_DIRS}/tbb/tbb_stddef.h") |
| 199 |
file(READ "${TBB_INCLUDE_DIRS}/tbb/tbb_stddef.h" _tbb_version_file) |
199 |
file(READ "${TBB_INCLUDE_DIRS}/tbb/tbb_stddef.h" _tbb_version_file) |
| 200 |
else() |
200 |
else() |
| 201 |
file(READ "${TBB_INCLUDE_DIRS}/tbb/version.h" _tbb_version_file) |
201 |
file(READ "${TBB_INCLUDE_DIRS}/oneapi/tbb/version.h" _tbb_version_file) |
| 202 |
endif() |
202 |
endif() |
| 203 |
string(REGEX REPLACE ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1" |
203 |
string(REGEX REPLACE ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1" |
| 204 |
TBB_VERSION_MAJOR "${_tbb_version_file}") |
204 |
TBB_VERSION_MAJOR "${_tbb_version_file}") |
| 205 |
string(REGEX REPLACE ".*#define TBB_VERSION_MINOR ([0-9]+).*" "\\1" |
205 |
string(REGEX REPLACE ".*#define TBB_VERSION_MINOR ([0-9]+).*" "\\1" |
| 206 |
TBB_VERSION_MINOR "${_tbb_version_file}") |
206 |
TBB_VERSION_MINOR "${_tbb_version_file}") |
|
Lines 278-288
if(NOT TBB_FOUND)
Link Here
|
| 278 |
|
278 |
|
| 279 |
if(NOT MSVC AND NOT TBB_LIBRARIES) |
279 |
if(NOT MSVC AND NOT TBB_LIBRARIES) |
| 280 |
set(TBB_LIBRARIES ${TBB_LIBRARIES_RELEASE}) |
280 |
set(TBB_LIBRARIES ${TBB_LIBRARIES_RELEASE}) |
| 281 |
endif() |
281 |
endif() |
| 282 |
|
282 |
|
| 283 |
set(TBB_DEFINITIONS "") |
283 |
set(TBB_DEFINITIONS "TBB_VERSION_MAJOR=${TBB_VERSION_MAJOR}") |
| 284 |
if (MSVC AND TBB_STATIC) |
284 |
if (MSVC AND TBB_STATIC) |
| 285 |
set(TBB_DEFINITIONS __TBB_NO_IMPLICIT_LINKAGE) |
285 |
set(TBB_DEFINITIONS __TBB_NO_IMPLICIT_LINKAGE) |
| 286 |
endif () |
286 |
endif () |
| 287 |
|
287 |
|
| 288 |
unset (TBB_STATIC_SUFFIX) |
288 |
unset (TBB_STATIC_SUFFIX) |
