X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FCMakeLists.txt;h=e28111539d6e4c880ac35b7a886fe2e4b2871f1c;hb=HEAD;hp=70cfe703770c14d2e83c7960c559c0c8e842c2c8;hpb=7f29a0d27a72d6f1c7b96fcd89655ca504105c44;p=plugins%2Facisplugin.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 70cfe70..e281115 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015  OPEN CASCADE
+# Copyright (C) 2014-2016  OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,8 +18,7 @@
 #
 
 IF(SALOME_BUILD_GUI)
-  INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
+  INCLUDE(UseQtExt)
 ENDIF()
 
 # --- options ---
@@ -29,15 +28,16 @@ INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
   ${ACIS_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
+  ${GEOM_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}
   ${PROJECT_BINARY_DIR}/idl
+  ${CMAKE_CURRENT_BINARY_DIR}
   )
   
 IF(SALOME_BUILD_GUI)
   INCLUDE_DIRECTORIES(
     ${QT_INCLUDE_DIRS}
     ${GUI_INCLUDE_DIRS}
-    ${GEOM_INCLUDE_DIRS}
     )
 ENDIF()
 
@@ -101,7 +101,7 @@ ENDIF()
 
 IF(SALOME_BUILD_GUI)
   # sources / moc wrappings
-  QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+  QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
   SET(ACISPluginGUI_SOURCES
     ACISPlugin_GUI.cxx
@@ -145,7 +145,7 @@ IF(SALOME_BUILD_GUI)
   TARGET_LINK_LIBRARIES(ACISPluginGUI ${_link_gui_LIBRARIES})
   INSTALL(TARGETS ACISPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
   # install resources
-  QT4_INSTALL_TS_RESOURCES("${ACISPlugin_RESOURCES}" "${SALOME_ACISPLUGIN_INSTALL_RES_DATA}")
+  QT_INSTALL_TS_RESOURCES("${ACISPlugin_RESOURCES}" "${SALOME_ACISPLUGIN_INSTALL_RES_DATA}")
 ENDIF()
 
 # install headers