X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FOperationGUI%2FCMakeLists.txt;h=94cfc4c2d72831bf529a0d284f0a3ef31b763656;hb=81de8c6b1111574ee1afba1b27b0db5a8f0059c4;hp=2ff65aed2194b684f3392abbd47e9a2425513238;hpb=2a43dbcceb32d847ac6ab7b310b9a116e2c28861;p=modules%2Fgeom.git

diff --git a/src/OperationGUI/CMakeLists.txt b/src/OperationGUI/CMakeLists.txt
index 2ff65aed2..94cfc4c2d 100755
--- a/src/OperationGUI/CMakeLists.txt
+++ b/src/OperationGUI/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  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
@@ -17,17 +17,16 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}/idl
@@ -46,7 +45,7 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
   ${QT_DEFINITIONS}
   )
@@ -73,8 +72,8 @@ SET(OperationGUI_HEADERS
   OperationGUI_ChamferDlg.h
   OperationGUI_GetShapesOnShapeDlg.h
   OperationGUI_GetSharedShapesDlg.h
+  OperationGUI_ExtractionDlg.h
   OperationGUI_ExtrudedFeatureDlg.h
-  OperationGUI_ClippingDlg.h
   OperationGUI_TransferDataDlg.h
   )
 
@@ -87,18 +86,18 @@ SET(_moc_HEADERS
   OperationGUI_ChamferDlg.h
   OperationGUI_GetShapesOnShapeDlg.h
   OperationGUI_GetSharedShapesDlg.h
+  OperationGUI_ExtractionDlg.h
   OperationGUI_ExtrudedFeatureDlg.h
-  OperationGUI_ClippingDlg.h
   OperationGUI_TransferDataDlg.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(OperationGUI_SOURCES
   OperationGUI.cxx
@@ -109,8 +108,8 @@ SET(OperationGUI_SOURCES
   OperationGUI_FilletDlg.cxx
   OperationGUI_Fillet1d2dDlg.cxx
   OperationGUI_ChamferDlg.cxx
+  OperationGUI_ExtractionDlg.cxx
   OperationGUI_ExtrudedFeatureDlg.cxx
-  OperationGUI_ClippingDlg.cxx
   OperationGUI_TransferDataDlg.cxx
   ${_moc_SOURCES}
   ${_uic_files}