X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=adm_local%2Fcmake_files%2FFindSalomeTBB.cmake;h=5934aa531cf2ef75e244bc9603f83022a34bfde7;hp=2b9dcd5bad2f97019bdb6cbc58aace523140ff1a;hb=5535f6364f5396d6db17620f4feeba09303a6ccd;hpb=e77513237098d4ac9211603953ab0ef1184220a9

diff --git a/adm_local/cmake_files/FindSalomeTBB.cmake b/adm_local/cmake_files/FindSalomeTBB.cmake
index 2b9dcd5ba..5934aa531 100644
--- a/adm_local/cmake_files/FindSalomeTBB.cmake
+++ b/adm_local/cmake_files/FindSalomeTBB.cmake
@@ -1,9 +1,9 @@
-# Copyright (C) 2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,7 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(TBB TBB_INCLUDE_DIRS 2)
+SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(TBB TBB_INCLUDE_DIRS 1)
 MARK_AS_ADVANCED(TBB_INCLUDE_DIRS TBB_LIBRARIES)
 
-SALOME_ACCUMULATE_HEADERS(TBB_INCLUDE_DIRS)
+IF(TBB_FOUND) 
+  SALOME_ACCUMULATE_HEADERS(TBB_INCLUDE_DIRS)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${TBB_LIBRARIES})
+ENDIF()
\ No newline at end of file