Commit 1b6a1ea
cmake: Fix bug that caused oneTBB to not be found on Windows
The build system finds the TBB package via this call in Packages.cmake:
find_package(TBB REQUIRED COMPONENTS tbb)
On Windows oneTBB names its shared library "tbb12.dll" and "tbb12.lib".
FindTBB.cmake was updated to try to accommodate this, but the way it
was done required the component passed to find_package to be changed
to "tbb12" instead of "tbb" on Windows.
This change reverts that update and instead translates the "tbb"
component to "tbb12" within FindTBB.cmake when it calls find_library
to find the individual shared libraries for the package. This allows
us to keep the find_package call unchanged.
(Internal change: 2331094)1 parent b6ac9b8 commit 1b6a1ea
1 file changed
Lines changed: 11 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
224 | 224 | | |
225 | 225 | | |
226 | 226 | | |
227 | | - | |
| 227 | + | |
228 | 228 | | |
229 | | - | |
| 229 | + | |
230 | 230 | | |
231 | 231 | | |
232 | 232 | | |
233 | 233 | | |
234 | | - | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
235 | 241 | | |
236 | 242 | | |
237 | | - | |
| 243 | + | |
238 | 244 | | |
239 | 245 | | |
240 | 246 | | |
241 | 247 | | |
242 | | - | |
| 248 | + | |
243 | 249 | | |
244 | 250 | | |
245 | 251 | | |
| |||
0 commit comments