forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into gary/ios-simulator
- Loading branch information
Showing
6 changed files
with
76 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake | ||
index 2bb1f30d0..5700090d4 100644 | ||
--- a/cmake/defaults/Packages.cmake | ||
+++ b/cmake/defaults/Packages.cmake | ||
@@ -152,8 +152,8 @@ endif() | ||
|
||
|
||
# --TBB | ||
-find_package(TBB REQUIRED COMPONENTS tbb) | ||
-add_definitions(${TBB_DEFINITIONS}) | ||
+find_package(TBB CONFIG REQUIRED) | ||
+set(TBB_tbb_LIBRARY "TBB::tbb") | ||
|
||
# --math | ||
if(WIN32) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters