Further testing

diff --git a/adm_local/cmake_files/FindSalomeTelemac.cmake b/adm_local/cmake_files/FindSalomeTelemac.cmake
index 809064ed5ef724a36ab725d0c1876c6dc99c8c32..c16a2cb904ac236b4e5b9c768084ca7f5b7d198c 100644 (file)
--- a/adm_local/cmake_files/FindSalomeTelemac.cmake
+++ b/adm_local/cmake_files/FindSalomeTelemac.cmake
@@ -28,11 +28,9 @@ MARK_AS_ADVANCED(TELEMAC_LIBRARY_api
                  TELEMAC_LIBRARY_special
                  TELEMAC_LIBRARY_telemac2d
                  TELEMAC_LIBRARY_tomawac
-                 TELEMAC_LIBRARY_hermes
-                 TELEMAC_LIBRARY_partel
                  TELEMAC_LIBRARY_gretel
-                 TELEMAC_INCLUDE_DIR
-                 TELEMAC_API_SRC_DIR)
+                 TELEMAC_LIBRARY_partel
+                 TELEMAC_LIBRARY_hermes)
 
 IF(Telemac_FOUND OR TELEMAC_FOUND)
   SALOME_ACCUMULATE_HEADERS(TELEMAC_INCLUDE_DIR)

diff --git a/adm_local/cmake_files/FindTelemac.cmake b/adm_local/cmake_files/FindTelemac.cmake
index 91e62dfd36efa08be93ad572e3971670005feffa..1d9d939527a628130566c098ad596a831cc884c1 100644 (file)
--- a/adm_local/cmake_files/FindTelemac.cmake
+++ b/adm_local/cmake_files/FindTelemac.cmake
@@ -37,6 +37,8 @@ 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)
+FIND_PATH(TELEMAC_INCLUDE_DIR interface_telemac2d.mod
+          PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/include)
 
 # Handle the standard arguments of the find_package() command:
 INCLUDE(FindPackageHandleStandardArgs)
@@ -50,6 +52,4 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Telemac REQUIRED_VARS TELEMAC_LIBRARY_api
                                                         TELEMAC_LIBRARY_tomawac
                                                         TELEMAC_LIBRARY_gretel
                                                         TELEMAC_LIBRARY_partel
-                                                        TELEMAC_LIBRARY_hermes
-                                                        TELEMAC_INCLUDE_DIR
-                                                        TELEMAC_API_SRC_DIR)
+                                                        TELEMAC_LIBRARY_hermes)