X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHELLOGUI%2FCMakeLists.txt;h=ec14973f363ce4ad05c93dbbb6d8d6891f2ae29b;hb=85ac8d17c1458aae64708498fd19773b4f3c62ad;hp=9547e881ca81339c845fc9f9c3b13020da8c9289;hpb=99f5b85d424feb514dee9bc8f8964b136c62d1b1;p=samples%2Fhello.git

diff --git a/src/HELLOGUI/CMakeLists.txt b/src/HELLOGUI/CMakeLists.txt
index 9547e88..ec14973 100644
--- a/src/HELLOGUI/CMakeLists.txt
+++ b/src/HELLOGUI/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  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
@@ -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}
   ${Boost_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
@@ -38,7 +38,7 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
   ${PYTHON_DEFINITIONS}
 )
@@ -61,7 +61,7 @@ SET(HELLOGUI_HEADERS
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${HELLOGUI_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${HELLOGUI_HEADERS})
 
 
 # sources / static
@@ -89,4 +89,4 @@ TARGET_LINK_LIBRARIES(HELLO SalomeIDLHELLO ${_link_LIBRARIES} )
 INSTALL(TARGETS HELLO EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 INSTALL(FILES ${HELLOGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_HELLO_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_HELLO_INSTALL_RES_DATA}")