X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FCMakeLists.txt;h=ec44a6aafd4b1cb0171062b2218172ff4237a635;hp=05af0db649eb9c848b2c21650ca2e10dcb1316be;hb=cc54cd4b94f313f2f4c831cf2ab5de31eb71e11b;hpb=193c49c87753b6ccabb2b5e6dc935aa480d2d43e diff --git a/src/StdMeshers/CMakeLists.txt b/src/StdMeshers/CMakeLists.txt index 05af0db64..ec44a6aaf 100644 --- a/src/StdMeshers/CMakeLists.txt +++ b/src/StdMeshers/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2021 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 @@ -25,12 +25,11 @@ IF(SALOME_SMESH_USE_TBB) ENDIF(SALOME_SMESH_USE_TBB) INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} - ${VTK_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} - ${GUI_INCLUDE_DIRS} ${GEOM_INCLUDE_DIRS} + ${MEDCOUPLING_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/SMESHUtils ${PROJECT_SOURCE_DIR}/src/SMESH ${PROJECT_SOURCE_DIR}/src/SMESHDS @@ -47,7 +46,7 @@ ENDIF(SALOME_SMESH_ENABLE_MEFISTO) # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${BOOST_DEFINITIONS} ) @@ -59,13 +58,14 @@ ENDIF(SALOME_SMESH_USE_TBB) SET(_link_LIBRARIES ${KERNEL_SALOMELocalTrace} ${KERNEL_OpUtil} - ${CAS_TKAdvTools} - ${CAS_TKTopAlgo} - ${CAS_TKG3d} + ${OpenCASCADE_ModelingAlgorithms_LIBRARIES} + ${OpenCASCADE_ModelingData_LIBRARIES} ${GEOM_GEOMUtils} SMESHimpl SMESHDS + SMESHUtils ${TBB_LIBS} + ${Boost_LIBRARIES} ) IF(SALOME_SMESH_ENABLE_MEFISTO) @@ -132,6 +132,8 @@ SET(StdMeshers_HEADERS StdMeshers_Cartesian_3D.hxx StdMeshers_QuadFromMedialAxis_1D2D.hxx StdMeshers_PolygonPerFace_2D.hxx + StdMeshers_PolyhedronPerSolid_3D.hxx + StdMeshers_BlockRenumber.hxx ) IF(SALOME_SMESH_ENABLE_MEFISTO) @@ -197,6 +199,8 @@ SET(StdMeshers_SOURCES StdMeshers_Adaptive1D.cxx StdMeshers_QuadFromMedialAxis_1D2D.cxx StdMeshers_PolygonPerFace_2D.cxx + StdMeshers_PolyhedronPerSolid_3D.cxx + StdMeshers_BlockRenumber.cxx ) IF(SALOME_SMESH_ENABLE_MEFISTO)