From: Yoann AUDOUIN <B61570@dsp0761867.postes.calibre.edf.fr>
Date: Thu, 4 May 2017 07:55:08 +0000 (+0200)
Subject: Modification for new interface of openturns + cleanup
X-Git-Tag: Salome_8_3_Hydro_2_0rc1~14^2~12
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8c802a12fb055d7bc11d90836b0ced5283ee32ce;p=modules%2Fhydrosolver.git

Modification for new interface of openturns + cleanup
---

diff --git a/adm_local/cmake_files/FindTelemac.cmake b/adm_local/cmake_files/FindTelemac.cmake
index b9a32d2..6e7ee81 100644
--- a/adm_local/cmake_files/FindTelemac.cmake
+++ b/adm_local/cmake_files/FindTelemac.cmake
@@ -16,35 +16,31 @@
 #  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/${USETELCFG}/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_bief bief
-             PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
+             PATHS ${TELEMAC_ROOT_DIR}/builds/${USETELCFG}/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_damocles damocles
-             PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
+             PATHS ${TELEMAC_ROOT_DIR}/builds/${USETELCFG}/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_parallel parallel
-             PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
+             PATHS ${TELEMAC_ROOT_DIR}/builds/${USETELCFG}/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_sisyphe sisyphe
-             PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
+             PATHS ${TELEMAC_ROOT_DIR}/builds/${USETELCFG}/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_special special
-             PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
+             PATHS ${TELEMAC_ROOT_DIR}/builds/${USETELCFG}/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_telemac2d telemac2d
-             PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
+             PATHS ${TELEMAC_ROOT_DIR}/builds/${USETELCFG}/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_tomawac tomawac
-             PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
+             PATHS ${TELEMAC_ROOT_DIR}/builds/${USETELCFG}/wrap_api/lib)
 # FIND_LIBRARY(TELEMAC_LIBRARY_gretel gretel
-#              PATHS ${TELEMAC_ROOT_DIR}/salome/wrap_api/lib)
+#              PATHS ${TELEMAC_ROOT_DIR}/${USETELCFG}/wrap_api/lib)
 # FIND_LIBRARY(TELEMAC_LIBRARY_partel partel
-#              PATHS ${TELEMAC_ROOT_DIR}/salome/wrap_api/lib)
+#              PATHS ${TELEMAC_ROOT_DIR}/${USETELCFG}/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_hermes hermes
-             PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
+             PATHS ${TELEMAC_ROOT_DIR}/builds/${USETELCFG}/wrap_api/lib)
 IF(NOT EXISTS ${TELEMAC_LIBRARY_hermes})
   MESSAGE("Warning: ${TELEMAC_LIBRARY_hermes} does not exist")
   SET(TELEMAC_LIBRARY_hermes "")
 ENDIF()
-FIND_PATH(TELEMAC_INCLUDE_DIR interface_telemac2d.mod
-          PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/include)
-FIND_PATH(TELEMAC_API_SRC_DIR api_interface.f90
-          PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/src)
 
 # The order of the libraries is important for the API wrapper compilation
 SET(TELEMAC_LIBRARIES ${TELEMAC_LIBRARY_api}