X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FCMakeLists.txt;h=dfad28a865eb5ac0332f018592be1ca607c280c3;hb=1fb3ff621ac19da15742a5e8b9253b594977d14a;hp=8714c1b4f5e983d8abc7340790998f364b366c8b;hpb=6dcb33ab2f670eab4a3d3c24b9ff0761bc091d20;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/CMakeLists.txt b/src/StdMeshers/CMakeLists.txt index 8714c1b4f..dfad28a86 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-2019 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,10 @@ 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 +46,7 @@ ENDIF(SALOME_SMESH_ENABLE_MEFISTO) # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${BOOST_DEFINITIONS} ) @@ -59,9 +58,8 @@ 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 @@ -131,6 +129,7 @@ SET(StdMeshers_HEADERS StdMeshers_CartesianParameters3D.hxx StdMeshers_Cartesian_3D.hxx StdMeshers_QuadFromMedialAxis_1D2D.hxx + StdMeshers_PolygonPerFace_2D.hxx ) IF(SALOME_SMESH_ENABLE_MEFISTO) @@ -195,6 +194,7 @@ SET(StdMeshers_SOURCES StdMeshers_Cartesian_3D.cxx StdMeshers_Adaptive1D.cxx StdMeshers_QuadFromMedialAxis_1D2D.cxx + StdMeshers_PolygonPerFace_2D.cxx ) IF(SALOME_SMESH_ENABLE_MEFISTO)