X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGMSHPlugin%2FCMakeLists.txt;h=6a93a4f5acf071fe031e26cafab4b43301b7f4c3;hb=HEAD;hp=edc4c2f5973fab7f5e3a8edda30d6d65c9aa492b;hpb=34cafc8da1b61cf048a6c82ac3333e8b0b25391a;p=plugins%2Fgmshplugin.git

diff --git a/src/GMSHPlugin/CMakeLists.txt b/src/GMSHPlugin/CMakeLists.txt
index edc4c2f..6a93a4f 100644
--- a/src/GMSHPlugin/CMakeLists.txt
+++ b/src/GMSHPlugin/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright (C) 2012-2015  ALNEOS
-# Copyright (C) 2016-2021  EDF R&D
+# Copyright (C) 2016-2024  EDF
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -29,10 +29,12 @@ INCLUDE_DIRECTORIES(
   ${MEDCOUPLING_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
-  ${GMSH_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}/idl
 )
 
+#Avoid compilation warnings from gmsh headers
+INCLUDE_DIRECTORIES( SYSTEM  ${GMSH_INCLUDE_DIRS} )
+
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(  
   ${OMNIORB_DEFINITIONS}
@@ -55,6 +57,7 @@ SET(_link_LIBRARIES
   ${SMESH_SMDS}
   ${SMESH_SMESHDS}
   ${SMESH_SMESHimpl}
+  ${SMESH_StdMeshers}
   ${SMESH_SMESHEngine}
   ${SMESH_MeshDriverGMF}
   SalomeIDLGMSHPLUGIN
@@ -66,12 +69,19 @@ SET(_link_LIBRARIES
 SET(GMSHEngine_HEADERS
   GMSHPlugin_GMSH_2D.hxx
   GMSHPlugin_GMSH_2D_i.hxx
+  GMSHPlugin_GMSH_3D.hxx
+  GMSHPlugin_GMSH_3D_SA.hxx
+  GMSHPlugin_GMSH_3D_Remote.hxx
+  GMSHPlugin_GMSH_3D_Remote_i.hxx
+  GMSHPlugin_GMSH_3D_i.cxx
   GMSHPlugin_GMSH.hxx
   GMSHPlugin_GMSH_i.hxx
   GMSHPlugin_Hypothesis.hxx
   GMSHPlugin_Hypothesis_i.hxx
   GMSHPlugin_Hypothesis_2D.hxx
   GMSHPlugin_Hypothesis_2D_i.hxx
+  GMSHPlugin_Hypothesis_3D.hxx
+  GMSHPlugin_Hypothesis_3D_i.hxx
   GMSHPlugin_Mesher.hxx
   GMSHPlugin_Defs.hxx
 )
@@ -82,16 +92,27 @@ SET(GMSHEngine_HEADERS
 SET(GMSHEngine_SOURCES
   GMSHPlugin_GMSH_2D.cxx
   GMSHPlugin_GMSH_2D_i.cxx
+  GMSHPlugin_GMSH_3D.cxx
+  GMSHPlugin_GMSH_3D_SA.cxx
+  GMSHPlugin_GMSH_3D_Remote.cxx
+  GMSHPlugin_GMSH_3D_Remote_i.cxx
+  GMSHPlugin_GMSH_3D_i.cxx
   GMSHPlugin_GMSH.cxx
   GMSHPlugin_GMSH_i.cxx
   GMSHPlugin_Hypothesis.cxx
   GMSHPlugin_Hypothesis_i.cxx
   GMSHPlugin_Hypothesis_2D.cxx
   GMSHPlugin_Hypothesis_2D_i.cxx
+  GMSHPlugin_Hypothesis_3D.cxx
+  GMSHPlugin_Hypothesis_3D_i.cxx
   GMSHPlugin_Mesher.cxx
   GMSHPlugin_i.cxx
 )
 
+SET(GmshRunner_SOURCES
+  GMSHPlugin_Runner_main.cxx
+)
+
 # --- scripts ---
 
 # scripts / static
@@ -106,6 +127,10 @@ ADD_LIBRARY(GMSHEngine ${GMSHEngine_SOURCES})
 TARGET_LINK_LIBRARIES(GMSHEngine ${_link_LIBRARIES} )
 INSTALL(TARGETS GMSHEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
+ADD_EXECUTABLE(GMSHPlugin_Runner ${GmshRunner_SOURCES})
+TARGET_LINK_LIBRARIES(GMSHPlugin_Runner ${_link_LIBRARIES} GMSHEngine )
+INSTALL(TARGETS GMSHPlugin_Runner EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
+
 INSTALL(FILES ${GMSHEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
 
 SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/GMSHPlugin)