X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FOBJECT%2FCMakeLists.txt;h=d15e509d414094bff4173645f405ab316ad58e9b;hp=44940d59e5b6aab3f30aee0c58dfba01aafff2a4;hb=d9f4b53e489dd5857db264ede6acded7b076c9f1;hpb=3957e28e356bf351b3c7f2bdd5f923f99e6c277f diff --git a/src/OBJECT/CMakeLists.txt b/src/OBJECT/CMakeLists.txt index 44940d59e..d15e509d4 100644 --- a/src/OBJECT/CMakeLists.txt +++ b/src/OBJECT/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2022 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,8 +25,7 @@ INCLUDE_DIRECTORIES( ${MEDFILE_INCLUDE_DIRS} ${QWT_INCLUDE_DIR} ${GEOM_INCLUDE_DIRS} - ${CAS_INCLUDE_DIRS} - ${VTK_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/Controls @@ -42,7 +41,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${BOOST_DEFINITIONS} ${OMNIORB_DEFINITIONS} ) @@ -50,19 +49,19 @@ ADD_DEFINITIONS( # libraries to link to SET(_link_LIBRARIES ${QT_LIBRARIES} - ${VTK_LIBRARIES} - ${CAS_KERNEL} + ${OpenCASCADE_KERNEL} ${GEOM_GEOMObject} - ${GUI_SalomeApp} ${GUI_SalomeObject} ${GUI_SVTK} ${GUI_VTKViewer} ${GUI_qtx} ${GUI_suit} ${GUI_std} + ${GUI_SalomeApp} SMESHClient SMDS SMESHControls + VTK::RenderingLabel ) IF(SALOME_USE_PLOT2DVIEWER) @@ -79,6 +78,7 @@ SET(SMESHObject_HEADERS SMESH_Actor.h SMESH_Object.h SMESH_ObjectDef.h + SMESH_ActorProps.h SMESH_ActorUtils.h SMESH_ActorDef.h SMESH_DeviceActor.h @@ -98,6 +98,7 @@ SET(SMESHObject_SOURCES SMESH_Object.cxx SMESH_DeviceActor.cxx SMESH_Actor.cxx + SMESH_ActorProps.cxx SMESH_PreviewActorsCollection.cxx SMESH_ExtractGeometry.cxx SMESH_ActorUtils.cxx