Merge remote branch 'origin/V7_dev' into V8_0_0_BR

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

diff --git a/src/TransformationGUI/CMakeLists.txt b/src/TransformationGUI/CMakeLists.txt
index 34622e9c48ef0dd9ecd3c06e7fc3da673f060079..94996f4bda0c22e6aa1109806fa6539d8cbd0034 100755 (executable)
--- a/src/TransformationGUI/CMakeLists.txt
+++ b/src/TransformationGUI/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2015  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
@@ -17,14 +17,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
@@ -75,6 +73,7 @@ SET(TransformationGUI_HEADERS
   TransformationGUI_ScaleDlg.h
   TransformationGUI_OffsetDlg.h
   TransformationGUI_ProjectionDlg.h
+  TransformationGUI_ProjectionOnCylDlg.h
   TransformationGUI_PositionDlg.h
   )
 
@@ -89,16 +88,17 @@ SET(_moc_HEADERS
   TransformationGUI_ScaleDlg.h
   TransformationGUI_OffsetDlg.h
   TransformationGUI_ProjectionDlg.h
+  TransformationGUI_ProjectionOnCylDlg.h
   TransformationGUI_PositionDlg.h
   )
 
 # header files / uic wrappings
-QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
+QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
 
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(TransformationGUI_SOURCES
   TransformationGUI.cxx
@@ -111,6 +111,7 @@ SET(TransformationGUI_SOURCES
   TransformationGUI_ScaleDlg.cxx
   TransformationGUI_OffsetDlg.cxx
   TransformationGUI_ProjectionDlg.cxx
+  TransformationGUI_ProjectionOnCylDlg.cxx
   TransformationGUI_PositionDlg.cxx
   ${_moc_SOURCES}
   ${_uic_files}