Salome HOME
projects
/
plugins
/
gmshplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[bos #36460][EDF] Define (u,v) coordinates in meshed faces. Solve Projection1D2D...
[plugins/gmshplugin.git]
/
src
/
GMSHPlugin
/
CMakeLists.txt
diff --git
a/src/GMSHPlugin/CMakeLists.txt
b/src/GMSHPlugin/CMakeLists.txt
index 79c156d08545df0e202aaf02040c6c53d8440a4e..6a93a4f5acf071fe031e26cafab4b43301b7f4c3 100644
(file)
--- a/
src/GMSHPlugin/CMakeLists.txt
+++ b/
src/GMSHPlugin/CMakeLists.txt
@@
-1,5
+1,5
@@
# Copyright (C) 2012-2015 ALNEOS
# Copyright (C) 2012-2015 ALNEOS
-# Copyright (C) 2016-202
0 EDF R&D
+# Copyright (C) 2016-202
4 EDF
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-26,12
+26,15
@@
INCLUDE_DIRECTORIES(
${OpenCASCADE_INCLUDE_DIR}
${GEOM_INCLUDE_DIRS}
${SMESH_INCLUDE_DIRS}
${OpenCASCADE_INCLUDE_DIR}
${GEOM_INCLUDE_DIRS}
${SMESH_INCLUDE_DIRS}
+ ${MEDCOUPLING_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
${Boost_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
- ${GMSH_INCLUDE_DIRS}
${PROJECT_BINARY_DIR}/idl
)
${PROJECT_BINARY_DIR}/idl
)
+#Avoid compilation warnings from gmsh headers
+INCLUDE_DIRECTORIES( SYSTEM ${GMSH_INCLUDE_DIRS} )
+
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
${OMNIORB_DEFINITIONS}
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
${OMNIORB_DEFINITIONS}
@@
-54,6
+57,7
@@
SET(_link_LIBRARIES
${SMESH_SMDS}
${SMESH_SMESHDS}
${SMESH_SMESHimpl}
${SMESH_SMDS}
${SMESH_SMESHDS}
${SMESH_SMESHimpl}
+ ${SMESH_StdMeshers}
${SMESH_SMESHEngine}
${SMESH_MeshDriverGMF}
SalomeIDLGMSHPLUGIN
${SMESH_SMESHEngine}
${SMESH_MeshDriverGMF}
SalomeIDLGMSHPLUGIN
@@
-65,12
+69,19
@@
SET(_link_LIBRARIES
SET(GMSHEngine_HEADERS
GMSHPlugin_GMSH_2D.hxx
GMSHPlugin_GMSH_2D_i.hxx
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_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
)
GMSHPlugin_Mesher.hxx
GMSHPlugin_Defs.hxx
)
@@
-81,16
+92,27
@@
SET(GMSHEngine_HEADERS
SET(GMSHEngine_SOURCES
GMSHPlugin_GMSH_2D.cxx
GMSHPlugin_GMSH_2D_i.cxx
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_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
)
GMSHPlugin_Mesher.cxx
GMSHPlugin_i.cxx
)
+SET(GmshRunner_SOURCES
+ GMSHPlugin_Runner_main.cxx
+)
+
# --- scripts ---
# scripts / static
# --- scripts ---
# scripts / static
@@
-105,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})
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)
INSTALL(FILES ${GMSHEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/GMSHPlugin)