Revert "Proper way to find and use libtbb"

This reverts commit d6bf2b7d29.
actorid
Marc Zinnschlag 13 years ago
parent d6bf2b7d29
commit e9b95d55cd

@ -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)

@ -10,7 +10,6 @@ add_executable(esmtool
target_link_libraries(esmtool
${Boost_LIBRARIES}
${TBB_LIBRARY}
components
)

@ -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
)

@ -100,7 +100,6 @@ target_link_libraries(openmw
${BULLET_LIBRARIES}
${MYGUI_LIBRARIES}
${MYGUI_PLATFORM_LIBRARIES}
${TBB_LIBRARY}
components
)

@ -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)
Loading…
Cancel
Save