mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-21 10:53:51 +00:00
Proper way to find and use libtbb
This commit is contained in:
parent
0e934a52ca
commit
d6bf2b7d29
5 changed files with 19 additions and 1 deletions
|
@ -200,6 +200,7 @@ find_package(Boost REQUIRED COMPONENTS system filesystem program_options thread)
|
||||||
find_package(OIS REQUIRED)
|
find_package(OIS REQUIRED)
|
||||||
find_package(OpenAL REQUIRED)
|
find_package(OpenAL REQUIRED)
|
||||||
find_package(Bullet REQUIRED)
|
find_package(Bullet REQUIRED)
|
||||||
|
find_package(TBB REQUIRED)
|
||||||
IF(OGRE_STATIC)
|
IF(OGRE_STATIC)
|
||||||
find_package(Cg REQUIRED)
|
find_package(Cg REQUIRED)
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
|
|
|
@ -10,6 +10,7 @@ add_executable(esmtool
|
||||||
|
|
||||||
target_link_libraries(esmtool
|
target_link_libraries(esmtool
|
||||||
${Boost_LIBRARIES}
|
${Boost_LIBRARIES}
|
||||||
|
${TBB_LIBRARY}
|
||||||
components
|
components
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -77,6 +77,7 @@ target_link_libraries(omwlauncher
|
||||||
${OGRE_LIBRARIES}
|
${OGRE_LIBRARIES}
|
||||||
${OGRE_STATIC_PLUGINS}
|
${OGRE_STATIC_PLUGINS}
|
||||||
${QT_LIBRARIES}
|
${QT_LIBRARIES}
|
||||||
|
${TBB_LIBRARY}
|
||||||
components
|
components
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -100,6 +100,7 @@ target_link_libraries(openmw
|
||||||
${BULLET_LIBRARIES}
|
${BULLET_LIBRARIES}
|
||||||
${MYGUI_LIBRARIES}
|
${MYGUI_LIBRARIES}
|
||||||
${MYGUI_PLATFORM_LIBRARIES}
|
${MYGUI_PLATFORM_LIBRARIES}
|
||||||
|
${TBB_LIBRARY}
|
||||||
components
|
components
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
14
cmake/FindTBB.cmake
Normal file
14
cmake/FindTBB.cmake
Normal file
|
@ -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)
|
Loading…
Reference in a new issue