X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGUI%2FCMakeLists.txt;h=210d64b1fbf0b827230f0876602b6e379629945c;hb=f8f9feb8f5db534e5d558ec14cc6a021cad79e7f;hp=6abe9178fb38f4d60cd22bbde38635cd1202893c;hpb=e0799b140f6c8563d84e89526eb21c37c1f98a70;p=plugins%2Fhexoticplugin.git

diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
index 6abe917..210d64b 100644
--- a/src/GUI/CMakeLists.txt
+++ b/src/GUI/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2019  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
@@ -19,13 +19,13 @@
 
 ADD_SUBDIRECTORY(resources)
 
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
 # --- options ---
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDES}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${PYTHON_INCLUDES}
   ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
@@ -43,7 +43,7 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
@@ -51,7 +51,8 @@ ADD_DEFINITIONS(
 SET(_link_LIBRARIES
   ${SMESH_SMESH}
   ${SMESH_StdMeshersGUI}
-  ${CAS_KERNEL}
+  ${SMESH_PluginUtils}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
   ${GUI_suit}
   ${GUI_qtx}
   ${GUI_SalomeApp}
@@ -78,13 +79,14 @@ SET(HexoticPluginGUI_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
   HexoticPluginGUI.cxx
   HexoticPluginGUI_StdWidget.cxx
   HexoticPluginGUI_SizeMapsWidget.cxx
+  HexoticPluginGUI_ViscousLayersWidget.cxx
   HexoticPluginGUI_HypothesisCreator.cxx
 )
 
@@ -102,10 +104,11 @@ SET(_ts_RESOURCES
 SET(_uic_files
   HexoticPluginGUI_StdWidget_QTD.ui
   HexoticPluginGUI_SizeMapsWidget_QTD.ui
+  HexoticPluginGUI_ViscousLayersWidget_QTD.ui
 )
 
 # header files / uic wrappings
-QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
+QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
 
 # sources / to compile
 SET(HexoticPluginGUI_SOURCES ${_other_SOURCES} ${_moc_SOURCES} ${_uic_HEADERS})
@@ -118,4 +121,4 @@ INSTALL(TARGETS HexoticPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION $
 
 INSTALL(FILES ${HexoticPluginGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
 
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_HexoticPLUGIN_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_HexoticPLUGIN_INSTALL_RES_DATA}")