0026600: CMake should disable auto-link for TBB

implicit tbb linkage disabled

diff --git a/adm/cmake/tbb.cmake b/adm/cmake/tbb.cmake
index df059e3aae43fd5125045bd0a308e597d3a2b4cb..cf6b3a784cc5740e17b3f68bd06f4c491dd06ea0 100644 (file)
--- a/adm/cmake/tbb.cmake
+++ b/adm/cmake/tbb.cmake
@@ -58,6 +58,11 @@ if (WIN32 AND NOT DEFINED 3RDPARTY_TBBMALLOC_DLL_DIR)
   set (3RDPARTY_TBBMALLOC_DLL_DIR "" CACHE FILEPATH "The directory containing tbb malloc shared library")
 endif()
 
+if (MSVC)
+  add_definitions (-D__TBB_NO_IMPLICIT_LINKAGE)
+  add_definitions (-D__TBBMALLOC_NO_IMPLICIT_LINKAGE)
+endif()
+
 # include occt macros. compiler_bitness, os_wiht_bit, compiler
 OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
 

diff --git a/src/TKDraw/CMakeLists.txt b/src/TKDraw/CMakeLists.txt
index 854ed7908b966e08073b1584d991b392fe56562b..00a699d829a26bb5df911b7bd7a8f1e77890f3de 100644 (file)
--- a/src/TKDraw/CMakeLists.txt
+++ b/src/TKDraw/CMakeLists.txt
@@ -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)

diff --git a/src/TKMesh/CMakeLists.txt b/src/TKMesh/CMakeLists.txt
index 87efacf313e392ae628739cfd3e05cda79ae7637..da43fb4a95076f068f7089d19949f8852d2240f9 100644 (file)
--- a/src/TKMesh/CMakeLists.txt
+++ b/src/TKMesh/CMakeLists.txt
@@ -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)

diff --git a/src/TKQADraw/CMakeLists.txt b/src/TKQADraw/CMakeLists.txt
index 5d6004665e3fd88b3dbb186b398ca14267529ed6..d238275960d1fd0983bde6fa27c233914775af57 100644 (file)
--- a/src/TKQADraw/CMakeLists.txt
+++ b/src/TKQADraw/CMakeLists.txt
@@ -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)

diff --git a/src/TKernel/CMakeLists.txt b/src/TKernel/CMakeLists.txt
index 48f255bae890f3a8a98afa629da3f661a2b79e01..b9a6dd11ea733b356a9a73b6aea4530adc5e7cff 100644 (file)
--- a/src/TKernel/CMakeLists.txt
+++ b/src/TKernel/CMakeLists.txt
@@ -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)