land cover object is removed from the data model

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

diff --git a/src/HYDROGUI/CMakeLists.txt b/src/HYDROGUI/CMakeLists.txt
index ce49d5f592f4cf095ade09eb81e82fa0517322bf..ae5ef8328f34bfe0d7893607d28bb29c74ad672b 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 
@@ -289,18 +289,16 @@ 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}
 )
 
 
 add_library(HYDROGUI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${PROJECT_HEADERS_MOC})
-target_link_libraries(HYDROGUI HYDROData
+target_link_libraries(HYDROGUI HYDROData shapelib
     ${CAS_TKV3d} ${CAS_TKTopAlgo} ${CAS_TKBrep} ${CAS_TKBO}
     ${GUI_LightApp} ${GUI_CAM} ${GUI_suit} ${GUI_qtx} ${GUI_ObjBrowser} ${GUI_GraphicsView} ${GUI_std} 
     ${GUI_Event} ${GUI_OCCViewer} ${GEOM_GEOM} ${GEOM_GEOMBase} ${GEOM_CurveCreator}
@@ -309,7 +307,7 @@ target_link_libraries(HYDROGUI HYDROData
 
 INSTALL(TARGETS HYDROGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
-set(PROJECT_LIBRARIES HYDROGUI)
+set(PROJECT_LIBRARIES shapelib HYDROGUI)
 
 set(GUITS_SOURCES
   resources/HYDROGUI_images.ts
@@ -327,24 +325,3 @@ FILE(GLOB GUIXML_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.xml")
 FILE(GLOB GUITXT_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.txt")
 SET(GUI_DATA ${GUIPNG_DATA} ${GUIXML_DATA} ${GUITXT_DATA})
 INSTALL(FILES ${GUI_DATA} DESTINATION ${SALOME_HYDRO_INSTALL_RES_DATA})
-
-# tests
-if(SALOME_BUILD_TESTS)
-
-  set(TEST_HEADERS 
-    test_HYDROGUI_ListModel.h
-  )
-
-  set(TEST_SOURCES 
-    test_HYDROGUI_Main.cxx
-    test_HYDROGUI_ListModel.cxx    
-  )
-  
-  set(TEST_EXE test_HYDROGUI)
-  include(../../CMake/CPPUnitTests.cmake)
-  target_link_libraries(test_HYDROGUI ${CPPUNIT_LIBRARIES} HYDROData HYDROGUI)
-
-  INSTALL(TARGETS test_HYDROGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
-
-endif(SALOME_BUILD_TESTS)
-