X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FCMakeLists.txt;h=587ee89bd2f766ce4e4003e10a303cbed1f01ac9;hp=f4fa5526dd37ea88117259e0a7eb29f2287563ba;hb=60bb6273b99dc88e3d6f360d7ae5792a77c68d06;hpb=8731eed9296c2b3541e18b9133971d579d55d9b2 diff --git a/src/SMESHGUI/CMakeLists.txt b/src/SMESHGUI/CMakeLists.txt index f4fa5526d..587ee89bd 100644 --- a/src/SMESHGUI/CMakeLists.txt +++ b/src/SMESHGUI/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2020 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 @@ -34,6 +34,7 @@ INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} ${HDF5_INCLUDE_DIRS} + ${MEDCOUPLING_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/OBJECT ${PROJECT_SOURCE_DIR}/src/SMESHFiltersSelection ${PROJECT_SOURCE_DIR}/src/SMDS @@ -42,14 +43,9 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/src/Controls ${PROJECT_SOURCE_DIR}/src/SMESHClient ${PROJECT_SOURCE_DIR}/src/MEDWrapper - ${PROJECT_SOURCE_DIR}/src/ADAPT - ${PROJECT_SOURCE_DIR}/src/ADAPT_I - ${PROJECT_SOURCE_DIR}/src/ADAPTGUI + ${PROJECT_SOURCE_DIR}/src/SMESH_I ${PROJECT_BINARY_DIR} ${PROJECT_BINARY_DIR}/idl - ${PROJECT_BINARY_DIR}/src/ADAPTGUI - ${PROJECT_BINARY_DIR}/src/ADAPT_I - ${MEDCOUPLING_INCLUDE_DIRS} ) # additional preprocessor / compiler flags @@ -79,10 +75,7 @@ SET(_link_LIBRARIES SMDS SMESHControls SMESHObject - ADAPTGUI - ADAPTImpl - ADAPTEngine - ${MEDCoupling_medloader} + SMESHEngine ) # --- headers --- @@ -155,9 +148,8 @@ SET(_moc_HEADERS SMESHGUI_SplitBiQuad.h SMESHGUI_IdPreview.h SMESHGUI_PreVisualObj.h - SMESHGUI_AdaptDlg.h SMESHGUI_MG_ADAPTDRIVER.h - MG_ADAPTGUI.hxx # to replace in ../ADAPTGUI/ + SMESHGUI_MgAdaptDlg.h ) # header files / no moc processing @@ -180,7 +172,6 @@ SET(_other_HEADERS SMESHGUI_FileValidator.h SMESHGUI_SelectionProxy.h SMESH_SMESHGUI.hxx - #~MG_ADAPT.hxx # to replace in ../ADAPT/ ) # header files / to install @@ -274,10 +265,8 @@ SET(_other_SOURCES SMESHGUI_SplitBiQuad.cxx SMESHGUI_PreVisualObj.cxx SMESHGUI_IdPreview.cxx - SMESHGUI_AdaptDlg.cxx SMESHGUI_MG_ADAPTDRIVER.cxx - MG_ADAPTGUI.cxx # to replace in ../ADAPTGUI/ - #MG_ADAPT.cxx + SMESHGUI_MgAdaptDlg.cxx ) # sources / to compile