OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-19 13:40:49 +03:00
Code Activity

0026600: CMake should disable auto-link for TBB

Browse Source 
implicit tbb linkage disabled
This commit is contained in:
ibs
2015-08-25 15:22:35 +03:00
committed by bugmaster
parent 898f6a9222
commit fd7a842bae
5 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/TKDraw/CMakeLists.txt
View File

@@ -15,10 +15,6 @@ elseif(APPLE)
list( APPEND USED_LIBS ${FRAMEWORKS_TCL} )
find_library(FRAMEWORKS_TK NAMES Tk)
list( APPEND USED_LIBS ${FRAMEWORKS_TK} )
if(USE_TBB)
list( APPEND USED_LIBS tbb )
list( APPEND USED_LIBS tbbmalloc )
endif()
list( APPEND USED_LIBS objc )
find_library(FRAMEWORKS_APPKIT NAMES Appkit)
list( APPEND USED_LIBS ${FRAMEWORKS_APPKIT} )
@@ -28,10 +24,11 @@ else()
list( APPEND USED_LIBS tcl8.6 )
list( APPEND USED_LIBS X11 )
list( APPEND USED_LIBS tk8.6 )
if(USE_TBB)
list( APPEND USED_LIBS tbb )
list( APPEND USED_LIBS tbbmalloc )
endif()
endif()
if(USE_TBB)
list( APPEND USED_LIBS tbb )
list( APPEND USED_LIBS tbbmalloc )
endif()
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

8
src/TKMesh/CMakeLists.txt
View File

@@ -4,11 +4,9 @@ set (TOOLKIT_MODULES
BRepMesh
)
if(NOT WIN32)
if(USE_TBB)
list( APPEND USED_LIBS tbb )
list( APPEND USED_LIBS tbbmalloc )
endif()
if(USE_TBB)
list( APPEND USED_LIBS tbb )
list( APPEND USED_LIBS tbbmalloc )
endif()
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

10
src/TKQADraw/CMakeLists.txt
View File

@@ -14,11 +14,11 @@ if (WIN32)
list( APPEND USED_LIBS gdi32.lib )
list( APPEND USED_LIBS advapi32.lib )
list( APPEND USED_LIBS user32.lib )
else()
if(USE_TBB)
list( APPEND USED_LIBS tbb )
list( APPEND USED_LIBS tbbmalloc )
endif()
endif()
if(USE_TBB)
list( APPEND USED_LIBS tbb )
list( APPEND USED_LIBS tbbmalloc )
endif()
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

17
src/TKernel/CMakeLists.txt
View File

@@ -25,15 +25,14 @@ if (WIN32)
list( APPEND USED_LIBS gdi32.lib )
list( APPEND USED_LIBS user32.lib )
list( APPEND USED_LIBS kernel32.lib )
else()
if (NOT APPLE)
list( APPEND USED_LIBS pthread )
list( APPEND USED_LIBS rt )
endif()
if(USE_TBB)
list( APPEND USED_LIBS tbb )
list( APPEND USED_LIBS tbbmalloc )
endif()
elseif (NOT APPLE)
list( APPEND USED_LIBS pthread )
list( APPEND USED_LIBS rt )
endif()
if(USE_TBB)
list( APPEND USED_LIBS tbb )
list( APPEND USED_LIBS tbbmalloc )
endif()
OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)