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
Fix regression of 3D_mesh_GHS3D_01/B1
[modules/smesh.git]
/
src
/
StdMeshers
/
CMakeLists.txt
diff --git
a/src/StdMeshers/CMakeLists.txt
b/src/StdMeshers/CMakeLists.txt
index 040bb90f0dd9371e37f89ff5ba2836e0519cc5af..df1d952432f7598f66c2873971d91fa0162107b4 100644
(file)
--- a/
src/StdMeshers/CMakeLists.txt
+++ b/
src/StdMeshers/CMakeLists.txt
@@
-1,9
+1,9
@@
-# Copyright (C) 2012-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-201
9
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,11
+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}
${VTK_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${VTK_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
- ${G
UI
_INCLUDE_DIRS}
+ ${G
EOM
_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
@@
-46,7
+46,7
@@
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}
)
@@
-58,9
+58,9
@@
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
${TBB_LIBS}
SMESHimpl
SMESHDS
${TBB_LIBS}
@@
-75,8
+75,10
@@
ENDIF(SALOME_SMESH_ENABLE_MEFISTO)
# header files / no moc processing
SET(StdMeshers_HEADERS
StdMeshers_LocalLength.hxx
# 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
@@
-126,6
+128,9
@@
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
)
IF(SALOME_SMESH_ENABLE_MEFISTO)
)
IF(SALOME_SMESH_ENABLE_MEFISTO)
@@
-136,8
+141,10
@@
ENDIF(SALOME_SMESH_ENABLE_MEFISTO)
# sources / static
SET(StdMeshers_SOURCES
StdMeshers_LocalLength.cxx
# 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
@@
-186,6
+193,10
@@
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
)
IF(SALOME_SMESH_ENABLE_MEFISTO)
)
IF(SALOME_SMESH_ENABLE_MEFISTO)