From: Paul RASCLE Date: Thu, 20 Jul 2017 13:57:42 +0000 (+0200) Subject: Revert "debug after merge branch yan/V8_3_BR" X-Git-Tag: Salome_8_3_Hydro_2_0rc1~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8facaaa341432a098c7f2b73388ae31282b3ad5a;p=modules%2Fhydrosolver.git Revert "debug after merge branch yan/V8_3_BR" This reverts commit 85c0afc1346d8bd7b7744e06e5a0b02deec4926b. --- diff --git a/adm_local/cmake_files/FindTelemac.cmake b/adm_local/cmake_files/FindTelemac.cmake index e5e656d..4920ae3 100644 --- a/adm_local/cmake_files/FindTelemac.cmake +++ b/adm_local/cmake_files/FindTelemac.cmake @@ -15,8 +15,8 @@ # You should have received a copy of the GNU General Public License # along with SALOME HYDRO module. If not, see . -#FIND_LIBRARY(TELEMAC_LIBRARY_mascaret mascaret -# PATHS ${TELEMAC_ROOT_DIR}/builds/salomeHPC/wrap_api/lib) +FIND_LIBRARY(TELEMAC_LIBRARY_mascaret mascaret + PATHS ${TELEMAC_ROOT_DIR}/builds/salomeHPC/wrap_api/lib) FIND_LIBRARY(TELEMAC_LIBRARY_api api PATHS ${TELEMAC_ROOT_DIR}/builds/salomeHPC/wrap_api/lib) FIND_LIBRARY(TELEMAC_LIBRARY_bief bief @@ -51,9 +51,8 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Telemac REQUIRED_VARS TELEMAC_LIBRARY_api TELEMAC_LIBRARY_sisyphe TELEMAC_LIBRARY_special TELEMAC_LIBRARY_telemac2d + TELEMAC_LIBRARY_mascaret TELEMAC_LIBRARY_tomawac TELEMAC_LIBRARY_gretel TELEMAC_LIBRARY_partel TELEMAC_LIBRARY_hermes) - -# TELEMAC_LIBRARY_mascaret