From d6bf2b7d294d7298b691677e84ac051c86030397 Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
Date: Tue, 17 Jul 2012 00:11:56 +0400
Subject: [PATCH] Proper way to find and use libtbb

---
 CMakeLists.txt               |  1 +
 apps/esmtool/CMakeLists.txt  |  1 +
 apps/launcher/CMakeLists.txt |  3 ++-
 apps/openmw/CMakeLists.txt   |  1 +
 cmake/FindTBB.cmake          | 14 ++++++++++++++
 5 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 cmake/FindTBB.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9cc741c67..49684fd7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -200,6 +200,7 @@ find_package(Boost REQUIRED COMPONENTS system filesystem program_options thread)
 find_package(OIS REQUIRED)
 find_package(OpenAL REQUIRED)
 find_package(Bullet REQUIRED)
+find_package(TBB REQUIRED)
 IF(OGRE_STATIC)
 find_package(Cg REQUIRED)
 IF(WIN32)
diff --git a/apps/esmtool/CMakeLists.txt b/apps/esmtool/CMakeLists.txt
index af3dc090e..eb74aa992 100644
--- a/apps/esmtool/CMakeLists.txt
+++ b/apps/esmtool/CMakeLists.txt
@@ -10,6 +10,7 @@ add_executable(esmtool
 
 target_link_libraries(esmtool
   ${Boost_LIBRARIES}
+  ${TBB_LIBRARY}
   components
 )
 
diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
index ed3559fdc..57b7fb71a 100644
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@@ -75,8 +75,9 @@ add_executable(omwlauncher
 target_link_libraries(omwlauncher
     ${Boost_LIBRARIES}
     ${OGRE_LIBRARIES}
-	${OGRE_STATIC_PLUGINS}
+    ${OGRE_STATIC_PLUGINS}
     ${QT_LIBRARIES}
+    ${TBB_LIBRARY}
     components
 )
 
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index a66cda71e..feefa4fd2 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -100,6 +100,7 @@ target_link_libraries(openmw
     ${BULLET_LIBRARIES}
     ${MYGUI_LIBRARIES}
     ${MYGUI_PLATFORM_LIBRARIES}
+    ${TBB_LIBRARY}
     components
 )
 
diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
new file mode 100644
index 000000000..f84f81f1c
--- /dev/null
+++ b/cmake/FindTBB.cmake
@@ -0,0 +1,14 @@
+# Locate TBB
+# This module defines
+# TBB_LIBRARY
+# TBB_FOUND, if false, do not try to link to TBB 
+# TBB_INCLUDE_DIR, where to find the headers
+
+FIND_PATH(TBB_INCLUDE_DIR tbb/tbb.h)
+
+FIND_LIBRARY(TBB_LIBRARY NAMES tbb)
+
+SET(TBB_FOUND "NO")
+IF(TBB_LIBRARY AND TBB_INCLUDE_DIR)
+  SET(TBB_FOUND "YES")
+ENDIF(TBB_LIBRARY AND TBB_INCLUDE_DIR)