X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FCMakeLists.txt;h=907727b5b6505f40a89b3af3e5bc101c5e157a53;hb=c9294ee68826be2746e5cc00291a8641731d6e29;hp=aeb2f31e8cdc30cf802b90d0953753b1549ebfad;hpb=499f29d24922cec66e41b41a0039a954993bc6df;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/CMakeLists.txt b/src/StdMeshers/CMakeLists.txt index aeb2f31e8..907727b5b 100644 --- a/src/StdMeshers/CMakeLists.txt +++ b/src/StdMeshers/CMakeLists.txt @@ -38,12 +38,6 @@ INCLUDE_DIRECTORIES( ${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} @@ -68,10 +62,6 @@ SET(_link_LIBRARIES ${Boost_LIBRARIES} ) -IF(SALOME_SMESH_ENABLE_MEFISTO) - SET(_link_LIBRARIES ${_link_LIBRARIES} MEFISTO2D) -ENDIF(SALOME_SMESH_ENABLE_MEFISTO) - # --- headers --- # header files / no moc processing @@ -130,15 +120,13 @@ SET(StdMeshers_HEADERS StdMeshers_Projection_1D2D.hxx StdMeshers_CartesianParameters3D.hxx StdMeshers_Cartesian_3D.hxx + StdMeshers_Cartesian_VL.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 @@ -196,6 +184,7 @@ SET(StdMeshers_SOURCES 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 @@ -203,10 +192,6 @@ SET(StdMeshers_SOURCES 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})