X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGUI%2FCMakeLists.txt;h=08de2ddba68584f46cdb3575c251d1ccba18eff9;hb=0f738de9cfb2695b6f35214bc7ce470a6ac05818;hp=85358f0453fbe52419e1d19cf5097924950fb42a;hpb=a8601818db382eea6132f6ea9467217cd5466db4;p=plugins%2Fhybridplugin.git

diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
index 85358f0..08de2dd 100644
--- a/src/GUI/CMakeLists.txt
+++ b/src/GUI/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2020  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,13 +17,13 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
 # --- options ---
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDES}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${PYTHON_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
@@ -34,13 +34,14 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${PROJECT_BINARY_DIR}/idl
   ${PROJECT_SOURCE_DIR}/src/HYBRIDPlugin
+  ${PROJECT_SOURCE_DIR}/src/GUI
 )
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
@@ -50,13 +51,13 @@ SET(_link_LIBRARIES
   ${KERNEL_SALOMELocalTrace}
   ${GEOM_GEOM}
   ${SMESH_SMESH}
-  ${SMESH_GeomSelectionTools}
+  ${SMESH_PluginUtils}
   ${SMESH_StdMeshersGUI}
   ${SMESH_SMESHFiltersSelection}
   ${GUI_suit}
   ${GUI_qtx}
   ${GUI_SalomeApp}
-  ${CAS_KERNEL}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
   SalomeIDLHYBRIDPLUGIN
 )
 
@@ -64,6 +65,7 @@ SET(_link_LIBRARIES
 
 # header files / to be processed by moc
 SET(_moc_HEADERS
+  HYBRIDPluginGUI_TreeWidget.h
   HYBRIDPluginGUI_HypothesisCreator.h
   HYBRIDPluginGUI_Dlg.h
 )
@@ -78,13 +80,15 @@ SET(HYBRIDPluginGUI_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
   HYBRIDPluginGUI.cxx
   HYBRIDPluginGUI_HypothesisCreator.cxx
+  HYBRIDPluginGUI_StdWidget.cxx
   HYBRIDPluginGUI_AdvWidget.cxx
+  HYBRIDPluginGUI_TreeWidget.cxx
 )
 
 # --- resources ---
@@ -99,11 +103,12 @@ SET(_ts_RESOURCES
 
 # resource files / to be processed by uic
 SET(_uic_files
+  HYBRIDPluginGUI_StdWidget_QTD.ui
   HYBRIDPluginGUI_AdvWidget_QTD.ui
 )
 
 # header files / uic wrappings
-QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
+QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
 
 # sources / to compile
 SET(HYBRIDPluginGUI_SOURCES ${_other_SOURCES} ${_moc_SOURCES} ${_uic_HEADERS})
@@ -115,4 +120,4 @@ TARGET_LINK_LIBRARIES(HYBRIDPluginGUI ${_link_LIBRARIES} )
 INSTALL(TARGETS HYBRIDPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 INSTALL(FILES ${HYBRIDPluginGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_HYBRIDPLUGIN_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_HYBRIDPLUGIN_INSTALL_RES_DATA}")