X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FCMakeLists.txt;h=fe5553be4388ca669f45a608afea6ad4e5c2c6c3;hb=474a24023d42179de2c114e5c3844f0b857ddca3;hp=4569e5e43b0c1e02d7d21621bd8c8f5fe4342ba8;hpb=3a821b48ba986795abde72f524fa1a62a5802df2;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/CMakeLists.txt b/src/SMESHGUI/CMakeLists.txt index 4569e5e43..fe5553be4 100644 --- a/src/SMESHGUI/CMakeLists.txt +++ b/src/SMESHGUI/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2016 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,7 +25,7 @@ INCLUDE_DIRECTORIES( ${QT_INCLUDES} ${VTK_INCLUDE_DIRS} ${OGL_INCLUDE_DIRS} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} @@ -42,14 +42,14 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/src/SMESHUtils ${PROJECT_SOURCE_DIR}/src/Controls ${PROJECT_SOURCE_DIR}/src/SMESHClient - ${PROJECT_SOURCE_DIR}/src/MEDWrapper/Base + ${PROJECT_SOURCE_DIR}/src/MEDWrapper ${PROJECT_BINARY_DIR} ${PROJECT_BINARY_DIR}/idl ) # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${BOOST_DEFINITIONS} ${OMNIORB_DEFINITIONS} ) @@ -61,7 +61,7 @@ ENDIF(WIN32) # libraries to link to SET(_link_LIBRARIES - ${CAS_TKV3d} + ${OpenCASCADE_Visualization_LIBRARIES} ${GUI_SalomePrs} ${GUI_suit} ${GUI_SUITApp} @@ -103,6 +103,7 @@ SET(_moc_HEADERS SMESHGUI_MultiEditDlg.h SMESHGUI_DeleteGroupDlg.h SMESHGUI_GroupOpDlg.h + SMESHGUI_FaceGroupsSeparatedByEdgesDlg.h SMESHGUI_SmoothingDlg.h SMESHGUI_RenumberingDlg.h SMESHGUI_ExtrusionDlg.h @@ -143,7 +144,6 @@ SET(_moc_HEADERS SMESHGUI_FieldSelectorWdg.h SMESHGUI_DisplayEntitiesDlg.h SMESHGUI_SplitBiQuad.h - SMESHGUI_PreVisualObj.h SMESHGUI_IdPreview.h ) @@ -165,6 +165,7 @@ SET(_other_HEADERS SMESHGUI_MeshEditPreview.h SMESHGUI_IdValidator.h SMESHGUI_FileValidator.h + SMESHGUI_SelectionProxy.h SMESH_SMESHGUI.hxx ) @@ -189,6 +190,7 @@ SET(_other_SOURCES SMESHGUI_GroupDlg.cxx SMESHGUI_RemoveNodesDlg.cxx SMESHGUI_RemoveElementsDlg.cxx + SMESHGUI_SelectionProxy.cxx SMESHGUI_MeshInfo.cxx SMESHGUI_Measurements.cxx SMESHGUI_Preferences_ScalarBarDlg.cxx @@ -199,6 +201,7 @@ SET(_other_SOURCES SMESHGUI_MultiEditDlg.cxx SMESHGUI_DeleteGroupDlg.cxx SMESHGUI_GroupOpDlg.cxx + SMESHGUI_FaceGroupsSeparatedByEdgesDlg.cxx SMESHGUI_SmoothingDlg.cxx SMESHGUI_RenumberingDlg.cxx SMESHGUI_ExtrusionDlg.cxx