From: Yoann AUDOUIN <B61570@dsp0761867.postes.calibre.edf.fr>
Date: Fri, 12 May 2017 12:02:11 +0000 (+0200)
Subject: Changin some of the checks with cmake
X-Git-Tag: Salome_8_3_Hydro_2_0rc1~14^2~10
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b45eb8f5e84d560c8662330796a6a38f72e0dd28;p=modules%2Fhydrosolver.git

Changin some of the checks with cmake
---

diff --git a/adm_local/cmake_files/FindSalomeTelemac.cmake b/adm_local/cmake_files/FindSalomeTelemac.cmake
index 732e617..809064e 100644
--- a/adm_local/cmake_files/FindSalomeTelemac.cmake
+++ b/adm_local/cmake_files/FindSalomeTelemac.cmake
@@ -28,11 +28,12 @@ MARK_AS_ADVANCED(TELEMAC_LIBRARY_api
                  TELEMAC_LIBRARY_special
                  TELEMAC_LIBRARY_telemac2d
                  TELEMAC_LIBRARY_tomawac
-                 TELEMAC_LIBRARIES
+                 TELEMAC_LIBRARY_hermes
+                 TELEMAC_LIBRARY_partel
+                 TELEMAC_LIBRARY_gretel
                  TELEMAC_INCLUDE_DIR
                  TELEMAC_API_SRC_DIR)
 
 IF(Telemac_FOUND OR TELEMAC_FOUND)
   SALOME_ACCUMULATE_HEADERS(TELEMAC_INCLUDE_DIR)
-  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${TELEMAC_LIBRARIES})
 ENDIF()
diff --git a/adm_local/cmake_files/FindTelemac.cmake b/adm_local/cmake_files/FindTelemac.cmake
index 1301164..91e62df 100644
--- a/adm_local/cmake_files/FindTelemac.cmake
+++ b/adm_local/cmake_files/FindTelemac.cmake
@@ -16,7 +16,7 @@
 #  along with SALOME HYDRO module.  If not, see <http://www.gnu.org/licenses/>.
 
 FIND_LIBRARY(TELEMAC_LIBRARY_api api
-  PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
+             PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_bief bief
              PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_damocles damocles
@@ -31,30 +31,12 @@ FIND_LIBRARY(TELEMAC_LIBRARY_telemac2d telemac2d
              PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_tomawac tomawac
              PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
-# FIND_LIBRARY(TELEMAC_LIBRARY_gretel gretel
-#              PATHS ${TELEMAC_ROOT_DIR}/salome/wrap_api/lib)
-# FIND_LIBRARY(TELEMAC_LIBRARY_partel partel
-#              PATHS ${TELEMAC_ROOT_DIR}/salome/wrap_api/lib)
+FIND_LIBRARY(TELEMAC_LIBRARY_gretel gretel
+             PATHS ${TELEMAC_ROOT_DIR}/salome/wrap_api/lib)
+FIND_LIBRARY(TELEMAC_LIBRARY_partel partel
+             PATHS ${TELEMAC_ROOT_DIR}/salome/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_hermes hermes
              PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
-IF(NOT EXISTS ${TELEMAC_LIBRARY_hermes})
-  MESSAGE("Warning: ${TELEMAC_LIBRARY_hermes} does not exist")
-  SET(TELEMAC_LIBRARY_hermes "")
-ENDIF()
-
-# The order of the libraries is important for the API wrapper compilation
-SET(TELEMAC_LIBRARIES ${TELEMAC_LIBRARY_api}
-                      ${TELEMAC_LIBRARY_gretel}
-                      ${TELEMAC_LIBRARY_partel}
-                      ${TELEMAC_LIBRARY_telemac2d}
-                      ${TELEMAC_LIBRARY_sisyphe}
-                      ${TELEMAC_LIBRARY_tomawac}
-                      ${TELEMAC_LIBRARY_bief}
-                      ${TELEMAC_LIBRARY_hermes}
-                      ${TELEMAC_LIBRARY_parallel}
-                      ${TELEMAC_LIBRARY_damocles}
-                      ${TELEMAC_LIBRARY_special}
-   )
 
 # Handle the standard arguments of the find_package() command:
 INCLUDE(FindPackageHandleStandardArgs)
@@ -66,8 +48,8 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Telemac REQUIRED_VARS TELEMAC_LIBRARY_api
                                                         TELEMAC_LIBRARY_special
                                                         TELEMAC_LIBRARY_telemac2d
                                                         TELEMAC_LIBRARY_tomawac
-#                                                         TELEMAC_LIBRARY_gretel
-#                                                         TELEMAC_LIBRARY_partel
-                                                        #TELEMAC_LIBRARY_hermes  # Optional
+                                                        TELEMAC_LIBRARY_gretel
+                                                        TELEMAC_LIBRARY_partel
+                                                        TELEMAC_LIBRARY_hermes
                                                         TELEMAC_INCLUDE_DIR
                                                         TELEMAC_API_SRC_DIR)