Merge remote-tracking branch 'remotes/origin/BR_2017' into HEAD

[modules/hydro.git] / src / HYDRO_tests / ExternalFiles.cmake

diff --git a/src/HYDRO_tests/ExternalFiles.cmake b/src/HYDRO_tests/ExternalFiles.cmake
index dfa0344b11a9603ed1445506ad21a5c67cd0791b..2b207f3c03f9757f15bb402d02f7bf09a26857e5 100644 (file)
--- a/src/HYDRO_tests/ExternalFiles.cmake
+++ b/src/HYDRO_tests/ExternalFiles.cmake
@@ -1,5 +1,7 @@
 
-find_package(Qt4 4.8.4 REQUIRED QtCore QtGui )
+find_package( Qt5Core )
+find_package( Qt5Widgets )
+set(CMAKE_AUTOMOC ON)
 
 set( EXTERNAL_FILES
   ../HYDROData/HYDROData_AltitudeObject.cxx
@@ -55,8 +57,8 @@ set( EXTERNAL_FILES
   ../HYDROData/HYDROData_SinusX.cxx
   ../HYDROData/HYDROData_ShapeFile.cxx
   ../HYDROData/HYDROData_LandCoverMap.cxx
-  ../HYDROData/HYDROData_QuadTree.cxx
-  ../HYDROData/HYDROData_QuadTreeNode.cxx
+  ../HYDROData/HYDROData_Quadtree.cxx
+  ../HYDROData/HYDROData_QuadtreeNode.cxx
   ../HYDROData/HYDROData_LCM_FaceClassifier.cxx
   ../HYDROData/HYDROData_DTM.cxx
 
@@ -73,11 +75,27 @@ set( EXTERNAL_FILES
   ../HYDROGUI/HYDROGUI_StricklerTableDlg.cxx
   ../HYDROGUI/HYDROGUI_LineEditDoubleValidator.cxx
   ../HYDROGUI/HYDROGUI_Tool.cxx
+  ../HYDROGUI/HYDROGUI_StreamDlg.cxx
+  ../HYDROGUI/HYDROGUI_ListSelector.cxx
+  ../HYDROGUI/HYDROGUI_OrderedListWidget.cxx
+  ../HYDROGUI/HYDROGUI_Overview.cxx
+  ../HYDROGUI/HYDROGUI_ZoneTool.cxx
+  ../HYDROGUI/HYDROGUI_ProfileDlg.cxx
+  ../HYDROGUI/HYDROGUI_ViewerDlg.cxx
+  ../HYDROGUI/HYDROGUI_AISTrihedron.cxx
+  ../HYDROGUI/HYDROGUI_CurveCreatorProfile.cxx
 )
 
 set( MOC_HEADERS 
   ../HYDROGUI/HYDROGUI_InputPanel.h
   ../HYDROGUI/HYDROGUI_StricklerTableDlg.h
+  ../HYDROGUI/HYDROGUI_StreamDlg.h
+  ../HYDROGUI/HYDROGUI_ListSelector.h
+  ../HYDROGUI/HYDROGUI_OrderedListWidget.h
+  ../HYDROGUI/HYDROGUI_Overview.h
+  ../HYDROGUI/HYDROGUI_ZoneTool.h
+  ../HYDROGUI/HYDROGUI_ProfileDlg.h
+  ../HYDROGUI/HYDROGUI_ViewerDlg.h
 )
 
-QT4_WRAP_CPP( PROJECT_MOC_HEADERS ${MOC_HEADERS} )
+#QT5_WRAP_MOC( PROJECT_MOC_HEADERS ${MOC_HEADERS} )