refs #613: duplicated names

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

diff --git a/src/HYDROGUI/CMakeLists.txt b/src/HYDROGUI/CMakeLists.txt
index 769496f8b668a9499093b7b55d233b7b44b6145e..bbaf85f3fbb34484d5ab388448bd964698467b1b 100644 (file)
--- a/src/HYDROGUI/CMakeLists.txt
+++ b/src/HYDROGUI/CMakeLists.txt
@@ -1,4 +1,4 @@
-#include(../../CMake/Common.cmake)
+include(../../CMake/Common.cmake)
 include(../../CMake/UseQT4EXT.cmake)
  
 set(PROJECT_HEADERS 
@@ -37,12 +37,13 @@ set(PROJECT_HEADERS
     HYDROGUI_ImportImageDlg.h
     HYDROGUI_ImportImageOp.h
     HYDROGUI_ImportPolylineOp.h
-    HYDROGUI_ImportLandCoverOp.h
-    HYDROGUI_ImportLandCoverDlg.h
     HYDROGUI_ImportSinusXOp.h
     HYDROGUI_ExportSinusXOp.h
     HYDROGUI_ExportSinusXDlg.h
     HYDROGUI_InputPanel.h
+    HYDROGUI_LandCoverMapDlg.h
+    HYDROGUI_LandCoverMapOp.h
+    HYDROGUI_LandCoverMapPrs.h
     HYDROGUI_LocalCSDlg.h
     HYDROGUI_LocalCSOp.h
     HYDROGUI_MergePolylinesDlg.h
@@ -78,6 +79,7 @@ set(PROJECT_HEADERS
     HYDROGUI_Polyline.h
     HYDROGUI_ShapeBathymetry.h
     HYDROGUI_ShapeImage.h
+    HYDROGUI_ShapeLandCoverMap.h
     HYDROGUI_ShowHideOp.h
     HYDROGUI_SplitPolylinesDlg.h
     HYDROGUI_SplitPolylinesOp.h
@@ -86,8 +88,7 @@ set(PROJECT_HEADERS
     HYDROGUI_LineEditDoubleValidator.h
     HYDROGUI_StricklerTableDlg.h
     HYDROGUI_StricklerTableOp.h
-    HYDROGUI_LandCoverDlg.h
-    HYDROGUI_LandCoverOp.h
+    HYDROGUI_StricklerTypeComboBox.h
     HYDROGUI_SubmersibleOp.h
     HYDROGUI_Tool.h
     HYDROGUI_TwoImagesDlg.h
@@ -134,7 +135,6 @@ set(PROJECT_HEADERS
     HYDROGUI_RecognizeContoursDlg.h
     HYDROGUI_RecognizeContoursOp.h
     HYDROGUI_LandCoverColoringOp.h
-    HYDROGUI_ShapeLandCover.h
 )
 
 QT4_WRAP_CPP(PROJECT_HEADERS_MOC ${PROJECT_HEADERS})
@@ -175,11 +175,12 @@ set(PROJECT_SOURCES
     HYDROGUI_ImportImageOp.cxx
     HYDROGUI_ImportPolylineOp.cxx
     HYDROGUI_ImportSinusXOp.cxx
-    HYDROGUI_ImportLandCoverOp.cxx
-    HYDROGUI_ImportLandCoverDlg.cxx
     HYDROGUI_ExportSinusXOp.cxx
     HYDROGUI_ExportSinusXDlg.cxx
     HYDROGUI_InputPanel.cxx
+    HYDROGUI_LandCoverMapDlg.cxx
+    HYDROGUI_LandCoverMapOp.cxx
+    HYDROGUI_LandCoverMapPrs.cxx
     HYDROGUI_LocalCSDlg.cxx
     HYDROGUI_LocalCSOp.cxx
     HYDROGUI_MergePolylinesDlg.cxx
@@ -215,14 +216,14 @@ set(PROJECT_SOURCES
     HYDROGUI_Polyline.cxx
     HYDROGUI_ShapeBathymetry.cxx
     HYDROGUI_ShapeImage.cxx
+    HYDROGUI_ShapeLandCoverMap.cxx
     HYDROGUI_ShowHideOp.cxx
     HYDROGUI_StreamDlg.cxx
     HYDROGUI_StreamOp.cxx
     HYDROGUI_LineEditDoubleValidator.cxx
     HYDROGUI_StricklerTableDlg.cxx
     HYDROGUI_StricklerTableOp.cxx
-    HYDROGUI_LandCoverDlg.cxx
-    HYDROGUI_LandCoverOp.cxx
+    HYDROGUI_StricklerTypeComboBox.cxx
     HYDROGUI_SplitPolylinesDlg.cxx
     HYDROGUI_SplitPolylinesOp.cxx
     HYDROGUI_SubmersibleOp.cxx
@@ -272,7 +273,6 @@ set(PROJECT_SOURCES
     HYDROGUI_RecognizeContoursDlg.cxx
     HYDROGUI_RecognizeContoursOp.cxx
     HYDROGUI_LandCoverColoringOp.cxx
-    HYDROGUI_ShapeLandCover.cxx
 )
 
 add_definitions(
@@ -289,11 +289,8 @@ add_definitions(
 include_directories(
   ${CAS_INCLUDE_DIRS}
   ${QT_INCLUDES}
-#  ${GUI_ROOT_DIR}/include/salome
   ${GUI_INCLUDE_DIRS}
-#  ${GEOM_ROOT_DIR}/include/salome
   ${GEOM_INCLUDE_DIRS}
-  ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../shapelib
   ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData
   ${VTK_INCLUDE_DIRS}