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 2974e731273ab99659c5e1d83e50a78378b2a255..b43dd0cf57f3627a8c10c440c9f4cb9b192724da 100644 (file)
--- 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 65b2851c93441ad3dc9c96cc0c8e52921217c514..5eb4bb36b32049815e23a3697a4268e666caee48 100644 (file)
--- 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