Compile with Telemac and Mascaret.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27adaaf43ba7f9f1dce9c605369ac807378f6889..9b41d1b467cde2cfd50b3421c57f60d9b7a65842 100644 (file)
--- 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 51f40705900fb74a14474be44b81096490505495..ef4e69ceff6119cfac57af90147f6fc738d26f2e 100644 (file)
--- 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 93f627e110dd55f221810d1ef5f2622f1cf986ef..530024021a1566d4b4ee209239e167b49bc20736 100644 (file)
--- 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 f471ac120bf32ca4cebf9a5c505f49a6788481b3..26bb4155d5871a6cb344a5a6fce032c759b42867 100644 (file)
--- 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