X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FCMakeLists.txt;h=2947ada60c304967ae0c4174d097159b42bbac51;hb=b1ea58215737bb5dd03e12f98a73ba6edd354e93;hp=3a1348297710287166b4abdab4fde5ddc5b750a2;hpb=7eda9ca931ed2a11cb5e4637e4ffe19f5c061115;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/CMakeLists.txt b/src/StdMeshers/CMakeLists.txt index 3a1348297..2947ada60 100644 --- a/src/StdMeshers/CMakeLists.txt +++ b/src/StdMeshers/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2016 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,10 +57,8 @@ ENDIF(SALOME_SMESH_USE_TBB) SET(_link_LIBRARIES ${KERNEL_SALOMELocalTrace} ${KERNEL_OpUtil} - ${CAS_TKAdvTools} - ${CAS_TKTopAlgo} - ${CAS_TKG3d} - ${CAS_TKOffset} + ${OpenCASCADE_ModelingAlgorithms_LIBRARIES} + ${OpenCASCADE_ModelingData_LIBRARIES} ${GEOM_GEOMUtils} SMESHimpl SMESHDS @@ -133,6 +129,7 @@ SET(StdMeshers_HEADERS StdMeshers_Cartesian_3D.hxx StdMeshers_QuadFromMedialAxis_1D2D.hxx StdMeshers_PolygonPerFace_2D.hxx + StdMeshers_PolyhedronPerSolid_3D.hxx ) IF(SALOME_SMESH_ENABLE_MEFISTO) @@ -198,6 +195,7 @@ SET(StdMeshers_SOURCES StdMeshers_Adaptive1D.cxx StdMeshers_QuadFromMedialAxis_1D2D.cxx StdMeshers_PolygonPerFace_2D.cxx + StdMeshers_PolyhedronPerSolid_3D.cxx ) IF(SALOME_SMESH_ENABLE_MEFISTO)