Merge branch 'V7_dev'

[modules/geom.git] / src / XAOPlugin / CMakeLists.txt

diff --git a/src/XAOPlugin/CMakeLists.txt b/src/XAOPlugin/CMakeLists.txt
index 98da00638075bdcf5d88dbf2ff43a7c3671a26e1..a66566ad92589909fe48270de705915638e71fbd 100644 (file)
--- a/src/XAOPlugin/CMakeLists.txt
+++ b/src/XAOPlugin/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 IF(SALOME_BUILD_GUI)
-  INCLUDE(UseQt4Ext)
+  INCLUDE(UseQtExt)
 ENDIF()
 
 # --- options ---
@@ -39,7 +39,6 @@ INCLUDE_DIRECTORIES(
   
 IF(SALOME_BUILD_GUI)
   INCLUDE_DIRECTORIES(
-    ${QT_INCLUDE_DIRS}
     ${GUI_INCLUDE_DIRS}
     ${PROJECT_SOURCE_DIR}/src/OBJECT
     ${PROJECT_SOURCE_DIR}/src/GEOMGUI
@@ -110,7 +109,7 @@ ENDIF()
 
 IF(SALOME_BUILD_GUI)
   # sources / moc wrappings
-  QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+  QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
   SET(XAOPluginGUI_SOURCES
     XAOPlugin_GUI.cxx
@@ -148,7 +147,7 @@ IF(SALOME_BUILD_GUI)
   TARGET_LINK_LIBRARIES(XAOPluginGUI ${_link_gui_LIBRARIES})
   INSTALL(TARGETS XAOPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
   
-  QT4_INSTALL_TS_RESOURCES("${XAOPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
+  QT_INSTALL_TS_RESOURCES("${XAOPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
 ENDIF()