]> SALOME platform Git repositories - modules/hydrosolver.git/commitdiff
Salome HOME
Revert "debug after merge branch yan/V8_3_BR"
authorPaul RASCLE <paul.rascle@edf.fr>
Thu, 20 Jul 2017 13:57:42 +0000 (15:57 +0200)
committerPaul RASCLE <paul.rascle@edf.fr>
Thu, 20 Jul 2017 13:57:42 +0000 (15:57 +0200)
This reverts commit 85c0afc1346d8bd7b7744e06e5a0b02deec4926b.

adm_local/cmake_files/FindTelemac.cmake

index e5e656d633851a5401b76a019b0311fa00a44a8a..4920ae315c15f8b46d86fd2d1165324011819912 100644 (file)
@@ -15,8 +15,8 @@
 #  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/>.
 
-#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