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
Merge branch 'OCCT780'
[modules/smesh.git]
/
src
/
StdMeshers
/
CMakeLists.txt
diff --git
a/src/StdMeshers/CMakeLists.txt
b/src/StdMeshers/CMakeLists.txt
index 17a03916c6f34407499c97d5d6e3286c1c4e86b9..7d8b58a6d4d979dd419f5dbf8cf16d1dae8f81df 100644
(file)
--- a/
src/StdMeshers/CMakeLists.txt
+++ b/
src/StdMeshers/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-20
16 CEA/DEN, EDF R&D
, OPEN CASCADE
+# Copyright (C) 2012-20
24 CEA, EDF
, OPEN CASCADE
#
# 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
@@
-27,9
+27,9
@@
ENDIF(SALOME_SMESH_USE_TBB)
INCLUDE_DIRECTORIES(
${OpenCASCADE_INCLUDE_DIR}
${Boost_INCLUDE_DIRS}
INCLUDE_DIRECTORIES(
${OpenCASCADE_INCLUDE_DIR}
${Boost_INCLUDE_DIRS}
- ${VTK_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${GEOM_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
@@
-38,12
+38,6
@@
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(
${OpenCASCADE_DEFINITIONS}
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
${OpenCASCADE_DEFINITIONS}
@@
-63,13
+57,11
@@
SET(_link_LIBRARIES
${GEOM_GEOMUtils}
SMESHimpl
SMESHDS
${GEOM_GEOMUtils}
SMESHimpl
SMESHDS
+ 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
# --- headers ---
# header files / no moc processing
@@
-128,13
+120,14
@@
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_Cartesian_VL.hxx
StdMeshers_QuadFromMedialAxis_1D2D.hxx
StdMeshers_PolygonPerFace_2D.hxx
StdMeshers_QuadFromMedialAxis_1D2D.hxx
StdMeshers_PolygonPerFace_2D.hxx
+ StdMeshers_PolyhedronPerSolid_3D.hxx
+ StdMeshers_BlockRenumber.hxx
+ StdMeshers_ViscousLayerBuilder.hxx
)
)
-IF(SALOME_SMESH_ENABLE_MEFISTO)
- SET(StdMeshers_HEADERS ${StdMeshers_HEADERS} StdMeshers_MEFISTO_2D.hxx)
-ENDIF(SALOME_SMESH_ENABLE_MEFISTO)
# --- sources ---
# sources / static
# --- sources ---
# sources / static
@@
-192,15
+185,15
@@
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_Cartesian_VL.cxx
StdMeshers_Adaptive1D.cxx
StdMeshers_QuadFromMedialAxis_1D2D.cxx
StdMeshers_PolygonPerFace_2D.cxx
StdMeshers_Adaptive1D.cxx
StdMeshers_QuadFromMedialAxis_1D2D.cxx
StdMeshers_PolygonPerFace_2D.cxx
+ StdMeshers_PolyhedronPerSolid_3D.cxx
+ StdMeshers_BlockRenumber.cxx
+ StdMeshers_ViscousLayerBuilder.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})