From: mzn <mzn@opencascade.com>
Date: Thu, 24 Nov 2016 12:50:38 +0000 (+0300)
Subject: Compile with Telemac and Mascaret.
X-Git-Tag: v1.6~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2329ae27790b017efb01c8ba94e1d32e0708fdde;p=modules%2Fhydrosolver.git

Compile with Telemac and Mascaret.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27adaaf..9b41d1b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,8 +100,8 @@ FIND_PACKAGE(SalomePyQt4 REQUIRED)
 ## HYDROSOLVER specifics
 ##
 
-#FIND_PACKAGE(SalomeMascaret REQUIRED)
-#FIND_PACKAGE(SalomeTelemac REQUIRED)
+FIND_PACKAGE(SalomeMascaret REQUIRED)
+FIND_PACKAGE(SalomeTelemac REQUIRED)
 
 # Directories
 # (default values taken from KERNEL)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 51f4070..ef4e69c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,4 +19,4 @@ ADD_SUBDIRECTORY(HYDRO)
 ADD_SUBDIRECTORY(HYDROGUI)
 ADD_SUBDIRECTORY(HYDROTools)
 ADD_SUBDIRECTORY(salome_hydro)
-#ADD_SUBDIRECTORY(mascaret_wrapper)
+ADD_SUBDIRECTORY(mascaret_wrapper)
diff --git a/src/salome_hydro/CMakeLists.txt b/src/salome_hydro/CMakeLists.txt
index 93f627e..5300240 100644
--- a/src/salome_hydro/CMakeLists.txt
+++ b/src/salome_hydro/CMakeLists.txt
@@ -15,10 +15,10 @@
 #  You should have received a copy of the GNU General Public License
 #  along with SALOME HYDRO module.  If not, see <http://www.gnu.org/licenses/>.
 
-#ADD_SUBDIRECTORY(mascaret)
-#ADD_SUBDIRECTORY(telemac2d)
-#ADD_SUBDIRECTORY(pytel)
-#ADD_SUBDIRECTORY(coupling1d2d)
+ADD_SUBDIRECTORY(mascaret)
+ADD_SUBDIRECTORY(telemac2d)
+ADD_SUBDIRECTORY(pytel)
+ADD_SUBDIRECTORY(coupling1d2d)
 ADD_SUBDIRECTORY(boundary_conditions)
 
 # --- Python files ---
diff --git a/src/salome_hydro/telemac2d/CMakeLists.txt b/src/salome_hydro/telemac2d/CMakeLists.txt
index f471ac1..26bb415 100644
--- a/src/salome_hydro/telemac2d/CMakeLists.txt
+++ b/src/salome_hydro/telemac2d/CMakeLists.txt
@@ -51,6 +51,7 @@ MACRO(LIB_LIST_TO_LINKER_FLAGS LINKER_FLAGS_VAR LIB_LIST)
   ENDFOREACH(LIB ${LIB_LIST})
 ENDMACRO(LIB_LIST_TO_LINKER_FLAGS)
 
+SET (MEDFILE_LIBRARIES ${MEDFILE_ROOT_DIR}/lib/libmedC.so)
 LIB_LIST_TO_LINKER_FLAGS(LINKER_FLAGS "${TELEMAC_LIBRARIES};${HDF5_hdf5_LIBRARY};${MEDFILE_LIBRARIES};${PYTHON_LIBRARY}")
 
 # Python wrapping for Telemac2D created with f2py