-# Copyright (C) 2012-2013 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
# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
- ${QT_INCLUDE_DIRS}
- ${VTK_INCLUDE_DIRS}
+ ${PTHREAD_INCLUDE_DIR}
+ ${OPENCV_INCLUDE_DIR}
${OMNIORB_INCLUDE_DIR}
- ${CAS_INCLUDE_DIRS}
+ ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
${PROJECT_BINARY_DIR}/idl
${PROJECT_BINARY_DIR}
${PROJECT_SOURCE_DIR}/src/OBJECT
${PROJECT_SOURCE_DIR}/src/GEOMClient
+ ${PROJECT_SOURCE_DIR}/src/GEOMUtils
${PROJECT_SOURCE_DIR}/src/GEOMImpl
${PROJECT_SOURCE_DIR}/src/GEOMGUI
${PROJECT_SOURCE_DIR}/src/GEOMBase
+ ${PROJECT_SOURCE_DIR}/src/MeasureGUI
${PROJECT_SOURCE_DIR}/src/SKETCHER
+ ${PROJECT_SOURCE_DIR}/src/CurveCreator
${PROJECT_SOURCE_DIR}/src/ShapeRecognition
${PROJECT_SOURCE_DIR}/src/DlgRef
${PROJECT_BINARY_DIR}/src/DlgRef
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
- ${CAS_DEFINITIONS}
+ ${OpenCASCADE_DEFINITIONS}
${OMNIORB_DEFINITIONS}
${QT_DEFINITIONS}
+ ${OPENCV_DEFINITIONS}
)
# libraries to link to
SET(_link_LIBRARIES
GEOMObject
GEOMClient
+ GEOMUtils
GEOMImpl
GEOMBase
GEOM
DlgRef
GEOMSketcher
+ CurveCreator
+ MeasureGUI
)
# optional sources
IF(SALOME_GEOM_USE_OPENCV)
SET( FeatureDetectorDlg_Sources EntityGUI_FeatureDetectorDlg.cxx )
SET( FeatureDetectorDlg_moc_h EntityGUI_FeatureDetectorDlg.h )
+ LIST(APPEND _link_LIBRARIES GEOMShapeRec)
ENDIF()
# --- resources ---
EntityGUI.h
EntityGUI_Widgets.h
EntityGUI_SketcherDlg.h
+ EntityGUI_PolylineDlg.h
EntityGUI_3DSketcherDlg.h
+ EntityGUI_IsolineDlg.h
+ EntityGUI_SurfFromFaceDlg.h
EntityGUI_SubShapeDlg.h
EntityGUI_FeatureDetectorDlg.h
EntityGUI_PictureImportDlg.h
# header files / to be processed by moc
SET(_moc_HEADERS
EntityGUI_Widgets.h
+ EntityGUI_FieldDlg.h
EntityGUI_SketcherDlg.h
+ EntityGUI_PolylineDlg.h
EntityGUI_3DSketcherDlg.h
+ EntityGUI_IsolineDlg.h
+ EntityGUI_SurfFromFaceDlg.h
EntityGUI_SubShapeDlg.h
EntityGUI_PictureImportDlg.h
${FeatureDetectorDlg_moc_h}
)
# header files / uic wrappings
-QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
+QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
# --- sources ---
# sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(EntityGUI_SOURCES
EntityGUI.cxx
EntityGUI_Widgets.cxx
+ EntityGUI_FieldDlg.cxx
EntityGUI_SketcherDlg.cxx
+ EntityGUI_PolylineDlg.cxx
EntityGUI_3DSketcherDlg.cxx
+ EntityGUI_IsolineDlg.cxx
+ EntityGUI_SurfFromFaceDlg.cxx
EntityGUI_SubShapeDlg.cxx
EntityGUI_PictureImportDlg.cxx
${FeatureDetectorDlg_Sources}