From e9b95d55cdc0d78c861869c92f31846c047cdc0b Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 17 Jul 2012 09:49:52 +0200
Subject: [PATCH] Revert "Proper way to find and use libtbb"

This reverts commit d6bf2b7d294d7298b691677e84ac051c86030397.
---
 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, 1 insertion(+), 19 deletions(-)
 delete mode 100644 cmake/FindTBB.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49684fd7c..9cc741c67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -200,7 +200,6 @@ 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 eb74aa992..af3dc090e 100644
--- a/apps/esmtool/CMakeLists.txt
+++ b/apps/esmtool/CMakeLists.txt
@@ -10,7 +10,6 @@ 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 57b7fb71a..ed3559fdc 100644
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@@ -75,9 +75,8 @@ 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 feefa4fd2..a66cda71e 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -100,7 +100,6 @@ target_link_libraries(openmw
     ${BULLET_LIBRARIES}
     ${MYGUI_LIBRARIES}
     ${MYGUI_PLATFORM_LIBRARIES}
-    ${TBB_LIBRARY}
     components
 )
 
diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
deleted file mode 100644
index f84f81f1c..000000000
--- a/cmake/FindTBB.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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)