X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FCMakeLists.txt;h=b3acd18ac98e08c4d317cf1d817b222180475513;hp=7852ef6de3e1f2bdfd388c520286924c5b1104ab;hb=0b191577fc9ae12c2f265a4507e4dab72e385162;hpb=712a8ce960f9f03deaab3989492c4eaebc9c6e21 diff --git a/src/SMESHGUI/CMakeLists.txt b/src/SMESHGUI/CMakeLists.txt index 7852ef6de..b3acd18ac 100644 --- a/src/SMESHGUI/CMakeLists.txt +++ b/src/SMESHGUI/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2014 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 @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(UseQt4Ext) +INCLUDE(UseQtExt) # --- options --- # additional include directories @@ -39,9 +39,7 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/src/SMESHFiltersSelection ${PROJECT_SOURCE_DIR}/src/SMDS ${PROJECT_SOURCE_DIR}/src/SMESHDS - ${PROJECT_SOURCE_DIR}/src/SMESH ${PROJECT_SOURCE_DIR}/src/SMESHUtils - ${PROJECT_SOURCE_DIR}/src/SMESH_I ${PROJECT_SOURCE_DIR}/src/Controls ${PROJECT_SOURCE_DIR}/src/SMESHClient ${PROJECT_SOURCE_DIR}/src/MEDWrapper/Base @@ -74,7 +72,6 @@ SET(_link_LIBRARIES ${GEOM_GEOMObject} SMESHFiltersSelection SMDS - SMESHEngine SMESHControls SMESHObject ) @@ -143,10 +140,15 @@ SET(_moc_HEADERS SMESHGUI_PropertiesDlg.h SMESHGUI_Add0DElemsOnAllNodesDlg.h SMESHGUI_FieldSelectorWdg.h + SMESHGUI_DisplayEntitiesDlg.h + SMESHGUI_SplitBiQuad.h + SMESHGUI_PreVisualObj.h + SMESHGUI_IdPreview.h ) # header files / no moc processing SET(_other_HEADERS + SMESHGUI_Operations.h SMESHGUI_Utils.h SMESHGUI_HypothesesUtils.h SMESHGUI_Selection.h @@ -171,7 +173,7 @@ SET(SMESH_HEADERS ${_moc_HEADERS} ${_other_HEADERS}) # --- sources --- # sources / moc wrappings -QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) +QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS}) # sources / static SET(_other_SOURCES @@ -249,6 +251,10 @@ SET(_other_SOURCES SMESHGUI_MeshEditPreview.cxx SMESHGUI_FileValidator.cxx SMESHGUI_FieldSelectorWdg.cxx + SMESHGUI_DisplayEntitiesDlg.cxx + SMESHGUI_SplitBiQuad.cxx + SMESHGUI_PreVisualObj.cxx + SMESHGUI_IdPreview.cxx ) # sources / to compile @@ -272,4 +278,4 @@ INSTALL(TARGETS SMESH EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INS INSTALL(FILES ${SMESH_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) -QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SMESH_INSTALL_RES_DATA}") +QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SMESH_INSTALL_RES_DATA}")