Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7

[modules/hydro.git] / src / HYDROGUI / CMakeLists.txt

diff --git a/src/HYDROGUI/CMakeLists.txt b/src/HYDROGUI/CMakeLists.txt
index 549402caaa3e8a87aafa81a93864f3fff8a779fe..96cbffbcee1054708d25b9e46258e1e967bee620 100644 (file)
--- a/src/HYDROGUI/CMakeLists.txt
+++ b/src/HYDROGUI/CMakeLists.txt
@@ -1,6 +1,7 @@
 include(../../CMake/Common.cmake)
 include(../../CMake/UseQT4EXT.cmake)
- 
+INCLUDE(UseQtExt)
+
 set(PROJECT_HEADERS 
     HYDROGUI.h
     HYDROGUI_AbstractDisplayer.h
@@ -96,6 +97,7 @@ set(PROJECT_HEADERS
     HYDROGUI_StricklerTypeComboBox.h
     HYDROGUI_SubmersibleOp.h
     HYDROGUI_Tool.h
+    HYDROGUI_Tool2.h
     HYDROGUI_TwoImagesDlg.h
     HYDROGUI_TwoImagesOp.h
     HYDROGUI_UpdateFlags.h
@@ -144,7 +146,7 @@ set(PROJECT_HEADERS
     HYDROGUI_TransparencyDlg.h
 )
 
-QT4_WRAP_CPP(PROJECT_HEADERS_MOC ${PROJECT_HEADERS})
+QT_WRAP_MOC(PROJECT_HEADERS_MOC ${PROJECT_HEADERS})
 
 set(PROJECT_SOURCES 
     HYDROGUI_AbstractDisplayer.cxx
@@ -207,6 +209,7 @@ set(PROJECT_SOURCES
     HYDROGUI_Operations.cxx
     HYDROGUI_Poly3DDlg.cxx
     HYDROGUI_Poly3DOp.cxx
+    HYDROGUI_Polyline.cxx
     HYDROGUI_PolylineDlg.cxx
     HYDROGUI_PolylineOp.cxx
     HYDROGUI_ProfileDlg.cxx
@@ -225,7 +228,6 @@ set(PROJECT_SOURCES
     HYDROGUI_Region.cxx
     HYDROGUI_RemoveImageRefsOp.cxx
     HYDROGUI_Shape.cxx
-    HYDROGUI_Polyline.cxx
     HYDROGUI_ShapeBathymetry.cxx
     HYDROGUI_ShapeImage.cxx
     HYDROGUI_ShapeLandCoverMap.cxx
@@ -240,6 +242,7 @@ set(PROJECT_SOURCES
     HYDROGUI_SplitPolylinesOp.cxx
     HYDROGUI_SubmersibleOp.cxx
     HYDROGUI_Tool.cxx
+    HYDROGUI_Tool2.cxx
     HYDROGUI_TwoImagesDlg.cxx
     HYDROGUI_TwoImagesOp.cxx
     HYDROGUI_UpdateObjectOp.cxx