From: mpa <mpa@opencascade.com>
Date: Thu, 31 Oct 2013 11:08:56 +0000 (+0000)
Subject: CMake: Edition accumulation of LD_LIBRARY_PATH, PATH and PYTHONPATH
X-Git-Tag: V7_3_0a1~93
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e00fb4f780381a3b1324514a951b635b6be88c11;p=modules%2Fsmesh.git

CMake: Edition accumulation of LD_LIBRARY_PATH, PATH and PYTHONPATH
---

diff --git a/adm_local/cmake_files/FindSalomeCGNS.cmake b/adm_local/cmake_files/FindSalomeCGNS.cmake
index 2974e7312..b43dd0cf5 100644
--- a/adm_local/cmake_files/FindSalomeCGNS.cmake
+++ b/adm_local/cmake_files/FindSalomeCGNS.cmake
@@ -22,6 +22,5 @@ MARK_AS_ADVANCED(CGNS_INCLUDE_DIRS CGNS_LIBRARIES)
 
 IF(CGNS_FOUND) 
   SALOME_ACCUMULATE_HEADERS(CGNS_INCLUDE_DIRS)
-  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${CGNS_ROOT_DIR}/bin)
-  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${CGNS_ROOT_DIR}/lib)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${CGNS_LIBRARIES})
 ENDIF()
\ No newline at end of file
diff --git a/adm_local/cmake_files/FindSalomeTBB.cmake b/adm_local/cmake_files/FindSalomeTBB.cmake
index 65b2851c9..5eb4bb36b 100644
--- a/adm_local/cmake_files/FindSalomeTBB.cmake
+++ b/adm_local/cmake_files/FindSalomeTBB.cmake
@@ -22,6 +22,5 @@ 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