From f23bc8fc19897a368bcd76bef3f71d3ea8298630 Mon Sep 17 00:00:00 2001
From: "Jonathan R. Madsen" <jrmadsen@users.noreply.github.com>
Date: Thu, 9 Sep 2021 14:10:42 -0500
Subject: [PATCH] Improve finding TBB (#7)

* Improve finding TBB
* Quiet TBB find
---
 cmake/Packages.cmake | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/cmake/Packages.cmake b/cmake/Packages.cmake
index bae6c16c29..c98800a68d 100644
--- a/cmake/Packages.cmake
+++ b/cmake/Packages.cmake
@@ -89,11 +89,22 @@ find_library(DYNINST_API_RT dyninstAPI_RT
     PATHS ${Dyninst_ROOT_DIR} ${Dyninst_DIR}
     PATH_SUFFIXES lib)
 
-find_path(TBB_INCLUDE_DIR
-    NAMES tbb/tbb.h
-PATH_SUFFIXES include)
+# try to find TBB
+find_package(TBB QUIET)
 
-if(TBB_INCLUDE_DIR)
+# if fail try to use the Dyninst installed FindTBB.cmake
+if(NOT TBB_FOUND)
+    list(APPEND CMAKE_MODULE_PATH ${Dyninst_DIR}/Modules)
+    find_package(TBB QUIET)
+endif()
+
+if(NOT TBB_FOUND)
+    find_path(TBB_INCLUDE_DIR
+        NAMES tbb/tbb.h
+        PATH_SUFFIXES include)
+endif()
+
+if(TBB_INCLUDE_DIR AND NOT TBB_INCLUDE_DIRS)
     set(TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR})
 endif()