X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FCMakeLists.txt;h=87e4db8ebcc8929e4e19d5af901ca0f23e1bdcd6;hb=1ce54e1c128c2e3e5caf2a57daf92489c419fd6e;hp=b30a69e09697af69ec80cd09673524ff0116c9a9;hpb=b0a908c0d20341651771d0249fb10882f54b2aad;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/CMakeLists.txt b/src/StdMeshers/CMakeLists.txt index b30a69e09..87e4db8eb 100644 --- a/src/StdMeshers/CMakeLists.txt +++ b/src/StdMeshers/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2014 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2020 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,11 +25,9 @@ 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} ${PROJECT_SOURCE_DIR}/src/SMESHUtils ${PROJECT_SOURCE_DIR}/src/SMESH @@ -47,7 +45,7 @@ ENDIF(SALOME_SMESH_ENABLE_MEFISTO) # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${BOOST_DEFINITIONS} ) @@ -59,12 +57,12 @@ 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} ) @@ -130,6 +128,9 @@ SET(StdMeshers_HEADERS 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) @@ -193,6 +194,9 @@ SET(StdMeshers_SOURCES 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)