CMake: Edition accumulation of LD_LIBRARY_PATH and PATH

diff --git a/salome_adm/cmake_files/FindSalomeBoost.cmake b/salome_adm/cmake_files/FindSalomeBoost.cmake
index fd8c7b538ba96919f2730080f0ed52bb3507e27e..df3d85464b121fe1da106652592e45c63f6a9a30 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeBoost.cmake
+++ b/salome_adm/cmake_files/FindSalomeBoost.cmake
@@ -47,5 +47,5 @@ ENDIF()
 
 IF(Boost_FOUND OR BOOST_FOUND)
   SALOME_ACCUMULATE_HEADERS(Boost_INCLUDE_DIRS)
-  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${BOOST_ROOT_DIR}/lib)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${Boost_LIBRARIES})
 ENDIF()
\ No newline at end of file

diff --git a/salome_adm/cmake_files/FindSalomeCAS.cmake b/salome_adm/cmake_files/FindSalomeCAS.cmake
index a440326d0573b8d2c91fb7e67b0cc0f8e1b4bea1..50161cce78301140e94a33b24c28fcc555565cea 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeCAS.cmake
+++ b/salome_adm/cmake_files/FindSalomeCAS.cmake
@@ -48,6 +48,5 @@ ENDIF()
 
 IF(CAS_FOUND)
   SALOME_ACCUMULATE_HEADERS(CAS_INCLUDE_DIRS)
-  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${CAS_ROOT_DIR}/bin)
-  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${CAS_ROOT_DIR}/lib ${CAS_ROOT_DIR}/lin/lib)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${CAS_TKernel})
 ENDIF()

diff --git a/salome_adm/cmake_files/FindSalomeDoxygen.cmake b/salome_adm/cmake_files/FindSalomeDoxygen.cmake
index 511d81bc44da30bb0d5b5c3fdd16fa16cb10493c..9da127e35ee62aae8760a7369100863e1ddf6100 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeDoxygen.cmake
+++ b/salome_adm/cmake_files/FindSalomeDoxygen.cmake
@@ -40,5 +40,5 @@ ENDIF()
 MARK_AS_ADVANCED(DOXYGEN_SUPPORT_STL)
 
 IF(DOXYGEN_FOUND)
-  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${DOXYGEN_ROOT_DIR}/bin)
+  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${DOXYGEN_EXECUTABLE})
 ENDIF()

diff --git a/salome_adm/cmake_files/FindSalomeGraphviz.cmake b/salome_adm/cmake_files/FindSalomeGraphviz.cmake
index bbefabff2d164ede5264b6ac50fab37633f15467..ad3c3c4991e780b02f82caef53ec54d7170d8996 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeGraphviz.cmake
+++ b/salome_adm/cmake_files/FindSalomeGraphviz.cmake
@@ -28,7 +28,6 @@ SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Graphviz GRAPHVIZ_EXECUTABLE GRAPHVIZ_L
 MARK_AS_ADVANCED(GRAPHVIZ_EXECUTABLE GRAPHVIZ_LIBRARIES GRAPHVIZ_INCLUDE_DIRS)
 
 IF(GRAPHVIZ_FOUND)
-  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${GRAPHVIZ_ROOT_DIR}/bin)
-  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${GRAPHVIZ_ROOT_DIR}/lib 
-                                                ${GRAPHVIZ_ROOT_DIR}/lib/graphviz)
+  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${GRAPHVIZ_EXECUTABLE})
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${GRAPHVIZ_LIBRARIES})
 ENDIF()
\ No newline at end of file

diff --git a/salome_adm/cmake_files/FindSalomeHDF5.cmake b/salome_adm/cmake_files/FindSalomeHDF5.cmake
index 367755ca50d053c4d02cd1aae37e2f67ff595a14..6b227faf77ffbfe9918c04467b8fcad005fafdca 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeHDF5.cmake
+++ b/salome_adm/cmake_files/FindSalomeHDF5.cmake
@@ -89,6 +89,5 @@ endif()
 
 IF(HDF5_FOUND) 
   SALOME_ACCUMULATE_HEADERS(HDF5_INCLUDE_DIRS)
-  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${HDF5_ROOT_DIR}/bin)
-  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${HDF5_ROOT_DIR}/lib)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${HDF5_LIBRARIES})
 ENDIF()

diff --git a/salome_adm/cmake_files/FindSalomeLibBatch.cmake b/salome_adm/cmake_files/FindSalomeLibBatch.cmake
index 379f93c1d8ce61ee1b0219f3a8c896a08d6c20ec..8f01c2385d0124cf2731a31a70cf50a91e44790f 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeLibBatch.cmake
+++ b/salome_adm/cmake_files/FindSalomeLibBatch.cmake
@@ -29,5 +29,5 @@ SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(LibBatch LIBBATCH_ROOT_DIR_EXP 0)
 
 IF(SALOMELIBBATCH_FOUND) 
   SALOME_ACCUMULATE_HEADERS(LIBBATCH_INCLUDE_DIRS)
-  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${LIBBATCH_ROOT_DIR}/lib)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${LIBBATCH_LIBRARIES})
 ENDIF()
\ No newline at end of file

diff --git a/salome_adm/cmake_files/FindSalomeLibXml2.cmake b/salome_adm/cmake_files/FindSalomeLibXml2.cmake
index 60c4dbcd546b111a2d62cbbd25519d72f93efa85..4c760e16292f33fdba89a9d74a6ba9d9506437ca 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeLibXml2.cmake
+++ b/salome_adm/cmake_files/FindSalomeLibXml2.cmake
@@ -30,6 +30,5 @@ ENDIF()
 
 IF(LIBXML2_FOUND) 
   SALOME_ACCUMULATE_HEADERS(LIBXML2_INCLUDE_DIR)
-  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${LIBXML2_ROOT_DIR}/bin)
-  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${LIBXML2_ROOT_DIR}/lib)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${LIBXML2_LIBRARIES})
 ENDIF()

diff --git a/salome_adm/cmake_files/FindSalomeMEDFile.cmake b/salome_adm/cmake_files/FindSalomeMEDFile.cmake
index 9777406b2923b86e62fbeb093dd1a96ac312216c..7180826e2582dde57ed5430e56f13cbc60308c63 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeMEDFile.cmake
+++ b/salome_adm/cmake_files/FindSalomeMEDFile.cmake
@@ -29,6 +29,5 @@ SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(MEDFile MEDFILE_INCLUDE_DIRS 1)
 
 IF(MEDFILE_FOUND) 
   SALOME_ACCUMULATE_HEADERS(MEDFILE_INCLUDE_DIRS)
-  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${MEDFILE_ROOT_DIR}/bin)
-  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${MEDFILE_ROOT_DIR}/lib)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${MEDFILE_LIBRARIES})
 ENDIF()
\ No newline at end of file

diff --git a/salome_adm/cmake_files/FindSalomeMPI.cmake b/salome_adm/cmake_files/FindSalomeMPI.cmake
index 8741b5df0522412309b83c11bbdc104e19161339..4a5dbaaaa35a9e86ffcc7022f1281a0f5c9b2e20 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeMPI.cmake
+++ b/salome_adm/cmake_files/FindSalomeMPI.cmake
@@ -32,6 +32,5 @@ SET(MPI_LIBRARIES ${MPI_C_LIBRARIES} ${MPI_CXX_LIBRARIES})
 
 IF(MPI_FOUND) 
   SALOME_ACCUMULATE_HEADERS(MPI_INCLUDE_DIRS)
-  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${MPI_ROOT_DIR}/bin)
-  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${MPI_ROOT_DIR}/lib)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${MPI_LIBRARIES})
 ENDIF()

diff --git a/salome_adm/cmake_files/FindSalomeSWIG.cmake b/salome_adm/cmake_files/FindSalomeSWIG.cmake
index 85786497d7ea2831f0517992aba116013ded541e..8d2cb42c4f7efbddd276098c6b245b352faa400e 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeSWIG.cmake
+++ b/salome_adm/cmake_files/FindSalomeSWIG.cmake
@@ -27,5 +27,5 @@ SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(SWIG SWIG_EXECUTABLE 2)
 MARK_AS_ADVANCED(SWIG_EXECUTABLE SWIG_VERSION)
 
 IF(SWIG_FOUND) 
-  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${SWIG_ROOT_DIR}/bin)
+  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${SWIG_EXECUTABLE})
 ENDIF()