X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FCMakeLists.txt;h=5ab6e6c6e3f201adb8d227104e83a3597bf71943;hb=7e714e8fc0d0884011007c9daed6e6e492402693;hp=dfad28a865eb5ac0332f018592be1ca607c280c3;hpb=6d32f944a0a115b6419184c50b57bf7c4eef5786;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/CMakeLists.txt b/src/StdMeshers/CMakeLists.txt index dfad28a86..5ab6e6c6e 100644 --- a/src/StdMeshers/CMakeLists.txt +++ b/src/StdMeshers/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2019 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2023 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 @@ -27,9 +27,9 @@ ENDIF(SALOME_SMESH_USE_TBB) INCLUDE_DIRECTORIES( ${OpenCASCADE_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} - ${VTK_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 @@ -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} @@ -63,13 +57,11 @@ SET(_link_LIBRARIES ${GEOM_GEOMUtils} SMESHimpl SMESHDS + SMESHUtils ${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 @@ -128,13 +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 @@ -192,15 +184,14 @@ 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 + 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})