X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=adm_local%2Fcmake_files%2FFindSalomeTBB.cmake;h=0fc8270ee35fdc28e921f64740514bf6b20e8842;hb=ef27b97a53f27b807012a4e8646b1abc56f753af;hp=65b2851c93441ad3dc9c96cc0c8e52921217c514;hpb=ae1e664d2ab150ae687f4e5afd5e120eb62b5d49;p=modules%2Fsmesh.git diff --git a/adm_local/cmake_files/FindSalomeTBB.cmake b/adm_local/cmake_files/FindSalomeTBB.cmake index 65b2851c9..0fc8270ee 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-2015 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,11 +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) IF(TBB_FOUND) SALOME_ACCUMULATE_HEADERS(TBB_INCLUDE_DIRS) - SALOME_ACCUMULATE_ENVIRONMENT(PATH ${TBB_ROOT_DIR}/bin/intel64/cc4.1.0_libc2.4_kernel2.6.16.21) SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${TBB_LIBRARIES}) ENDIF() \ No newline at end of file