Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implementation of ExportMEDCoupling.
[modules/smesh.git]
/
src
/
StdMeshers
/
CMakeLists.txt
diff --git
a/src/StdMeshers/CMakeLists.txt
b/src/StdMeshers/CMakeLists.txt
index 8ac5d13751f7bc1c7ba335dc98bfa8434f2aa5f2..ec44a6aafd4b1cb0171062b2218172ff4237a635 100644
(file)
--- a/
src/StdMeshers/CMakeLists.txt
+++ b/
src/StdMeshers/CMakeLists.txt
@@
-1,9
+1,9
@@
-# Copyright (C) 2012-20
13
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-20
21
CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License
, or (at your option) any later version
.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-25,12
+25,11
@@
IF(SALOME_SMESH_USE_TBB)
ENDIF(SALOME_SMESH_USE_TBB)
INCLUDE_DIRECTORIES(
ENDIF(SALOME_SMESH_USE_TBB)
INCLUDE_DIRECTORIES(
- ${
CAS_INCLUDE_DIRS
}
+ ${
OpenCASCADE_INCLUDE_DIR
}
${Boost_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
- ${VTK_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
- ${G
UI
_INCLUDE_DIRS}
- ${
PROJECT_SOURCE_DIR}/src/MEFISTO2
+ ${G
EOM
_INCLUDE_DIRS}
+ ${
MEDCOUPLING_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/SMESHUtils
${PROJECT_SOURCE_DIR}/src/SMESH
${PROJECT_SOURCE_DIR}/src/SMESHDS
${PROJECT_SOURCE_DIR}/src/SMESHUtils
${PROJECT_SOURCE_DIR}/src/SMESH
${PROJECT_SOURCE_DIR}/src/SMESHDS
@@
-39,9
+38,15
@@
INCLUDE_DIRECTORIES(
${TBB_INCLUDES}
)
${TBB_INCLUDES}
)
+IF(SALOME_SMESH_ENABLE_MEFISTO)
+ INCLUDE_DIRECTORIES(
+ ${PROJECT_SOURCE_DIR}/src/MEFISTO2
+ )
+ENDIF(SALOME_SMESH_ENABLE_MEFISTO)
+
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
- ${
CAS
_DEFINITIONS}
+ ${
OpenCASCADE
_DEFINITIONS}
${BOOST_DEFINITIONS}
)
${BOOST_DEFINITIONS}
)
@@
-53,22
+58,29
@@
ENDIF(SALOME_SMESH_USE_TBB)
SET(_link_LIBRARIES
${KERNEL_SALOMELocalTrace}
${KERNEL_OpUtil}
SET(_link_LIBRARIES
${KERNEL_SALOMELocalTrace}
${KERNEL_OpUtil}
- ${
CAS_TKAdvTools}
- ${
CAS_TKTopAlgo
}
- ${
CAS_TKG3d
}
+ ${
OpenCASCADE_ModelingAlgorithms_LIBRARIES}
+ ${
OpenCASCADE_ModelingData_LIBRARIES
}
+ ${
GEOM_GEOMUtils
}
SMESHimpl
SMESHDS
SMESHimpl
SMESHDS
- MEFISTO2D
+ SMESHUtils
${TBB_LIBS}
${TBB_LIBS}
+ ${Boost_LIBRARIES}
)
)
+IF(SALOME_SMESH_ENABLE_MEFISTO)
+ SET(_link_LIBRARIES ${_link_LIBRARIES} MEFISTO2D)
+ENDIF(SALOME_SMESH_ENABLE_MEFISTO)
+
# --- headers ---
# header files / no moc processing
SET(StdMeshers_HEADERS
StdMeshers_LocalLength.hxx
# --- headers ---
# header files / no moc processing
SET(StdMeshers_HEADERS
StdMeshers_LocalLength.hxx
+ StdMeshers_Reversible1D.hxx
StdMeshers_StartEndLength.hxx
StdMeshers_Arithmetic1D.hxx
StdMeshers_StartEndLength.hxx
StdMeshers_Arithmetic1D.hxx
+ StdMeshers_Geometric1D.hxx
StdMeshers_FixedPoints1D.hxx
StdMeshers_NumberOfSegments.hxx
StdMeshers_Deflection1D.hxx
StdMeshers_FixedPoints1D.hxx
StdMeshers_NumberOfSegments.hxx
StdMeshers_Deflection1D.hxx
@@
-79,7
+91,6
@@
SET(StdMeshers_HEADERS
StdMeshers_NotConformAllowed.hxx
StdMeshers_Regular_1D.hxx
StdMeshers_Quadrangle_2D.hxx
StdMeshers_NotConformAllowed.hxx
StdMeshers_Regular_1D.hxx
StdMeshers_Quadrangle_2D.hxx
- StdMeshers_MEFISTO_2D.hxx
StdMeshers_Hexa_3D.hxx
StdMeshers_Penta_3D.hxx
StdMeshers_AutomaticLength.hxx
StdMeshers_Hexa_3D.hxx
StdMeshers_Penta_3D.hxx
StdMeshers_AutomaticLength.hxx
@@
-119,15
+130,24
@@
SET(StdMeshers_HEADERS
StdMeshers_Projection_1D2D.hxx
StdMeshers_CartesianParameters3D.hxx
StdMeshers_Cartesian_3D.hxx
StdMeshers_Projection_1D2D.hxx
StdMeshers_CartesianParameters3D.hxx
StdMeshers_Cartesian_3D.hxx
+ StdMeshers_QuadFromMedialAxis_1D2D.hxx
+ StdMeshers_PolygonPerFace_2D.hxx
+ StdMeshers_PolyhedronPerSolid_3D.hxx
+ StdMeshers_BlockRenumber.hxx
)
)
+IF(SALOME_SMESH_ENABLE_MEFISTO)
+ SET(StdMeshers_HEADERS ${StdMeshers_HEADERS} StdMeshers_MEFISTO_2D.hxx)
+ENDIF(SALOME_SMESH_ENABLE_MEFISTO)
# --- sources ---
# sources / static
SET(StdMeshers_SOURCES
StdMeshers_LocalLength.cxx
# --- sources ---
# sources / static
SET(StdMeshers_SOURCES
StdMeshers_LocalLength.cxx
+ StdMeshers_Reversible1D.cxx
StdMeshers_StartEndLength.cxx
StdMeshers_Arithmetic1D.cxx
StdMeshers_StartEndLength.cxx
StdMeshers_Arithmetic1D.cxx
+ StdMeshers_Geometric1D.cxx
StdMeshers_FixedPoints1D.cxx
StdMeshers_NumberOfSegments.cxx
StdMeshers_Deflection1D.cxx
StdMeshers_FixedPoints1D.cxx
StdMeshers_NumberOfSegments.cxx
StdMeshers_Deflection1D.cxx
@@
-138,7
+158,6
@@
SET(StdMeshers_SOURCES
StdMeshers_NotConformAllowed.cxx
StdMeshers_Regular_1D.cxx
StdMeshers_Quadrangle_2D.cxx
StdMeshers_NotConformAllowed.cxx
StdMeshers_Regular_1D.cxx
StdMeshers_Quadrangle_2D.cxx
- StdMeshers_MEFISTO_2D.cxx
StdMeshers_Penta_3D.cxx
StdMeshers_Hexa_3D.cxx
StdMeshers_AutomaticLength.cxx
StdMeshers_Penta_3D.cxx
StdMeshers_Hexa_3D.cxx
StdMeshers_AutomaticLength.cxx
@@
-177,8
+196,17
@@
SET(StdMeshers_SOURCES
StdMeshers_Projection_1D2D.cxx
StdMeshers_CartesianParameters3D.cxx
StdMeshers_Cartesian_3D.cxx
StdMeshers_Projection_1D2D.cxx
StdMeshers_CartesianParameters3D.cxx
StdMeshers_Cartesian_3D.cxx
+ StdMeshers_Adaptive1D.cxx
+ StdMeshers_QuadFromMedialAxis_1D2D.cxx
+ StdMeshers_PolygonPerFace_2D.cxx
+ StdMeshers_PolyhedronPerSolid_3D.cxx
+ StdMeshers_BlockRenumber.cxx
)
)
+IF(SALOME_SMESH_ENABLE_MEFISTO)
+ SET(StdMeshers_SOURCES ${StdMeshers_SOURCES} StdMeshers_MEFISTO_2D.cxx)
+ENDIF(SALOME_SMESH_ENABLE_MEFISTO)
+
# --- rules ---
ADD_LIBRARY(StdMeshers ${StdMeshers_SOURCES})
# --- rules ---
ADD_LIBRARY(StdMeshers ${StdMeshers_SOURCES})