X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FCMakeLists.txt;h=497d419541e42214c9c49a31efc6ee012f8e268f;hp=c996fc99f51d6d55091aac5031a7f650a84a9c1f;hb=7b4c10fd0e3bd5f6612582fb9ef39965b8f0055a;hpb=ee0738fe562f847342b7723db6fa4488f1865fd2 diff --git a/src/SMESHGUI/CMakeLists.txt b/src/SMESHGUI/CMakeLists.txt index c996fc99f..497d41954 100644 --- a/src/SMESHGUI/CMakeLists.txt +++ b/src/SMESHGUI/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2016 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 @@ -111,6 +112,7 @@ SET(_moc_HEADERS SMESHGUI_RotationDlg.h SMESHGUI_TranslationDlg.h SMESHGUI_ScaleDlg.h + SMESHGUI_OffsetDlg.h SMESHGUI_SymmetryDlg.h SMESHGUI_SewingDlg.h SMESHGUI_DuplicateNodesDlg.h @@ -142,7 +144,6 @@ SET(_moc_HEADERS SMESHGUI_FieldSelectorWdg.h SMESHGUI_DisplayEntitiesDlg.h SMESHGUI_SplitBiQuad.h - SMESHGUI_PreVisualObj.h SMESHGUI_IdPreview.h ) @@ -198,6 +199,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 @@ -206,6 +208,7 @@ SET(_other_SOURCES SMESHGUI_RotationDlg.cxx SMESHGUI_TranslationDlg.cxx SMESHGUI_ScaleDlg.cxx + SMESHGUI_OffsetDlg.cxx SMESHGUI_SymmetryDlg.cxx SMESHGUI_SewingDlg.cxx SMESHGUI_DuplicateNodesDlg.cxx