X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FHYDRO_tests%2FCMakeLists.txt;h=a9dfb54a6a089c0dd8c1496ef9091fde4e29ddd2;hb=e2416eca5bf95eb9a8b84d3159ef37a6c4eff230;hp=d916857c0b06b1e6b43ca6a62244b50199d0d709;hpb=1ab9149aec6b8043be14a5fde006c5124327443b;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt
index d916857c..a9dfb54a 100644
--- a/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@ -3,6 +3,8 @@ ADD_SUBDIRECTORY(reference_data)
 include(../../CMake/Common.cmake)
 include(ExternalFiles.cmake)
 
+set (CMAKE_POSITION_INDEPENDENT_CODE ON)
+
 set(PROJECT_HEADERS
   test_HYDROData_Bathymetry.h
   test_HYDROData_Channel.h
@@ -21,9 +23,14 @@ set(PROJECT_HEADERS
   test_HYDROGUI_LandCoverMapDlg.h
   test_HYDROData_CalcCase.h
   test_HYDROData_Stream.h
+  test_HYDROData_Tool.h
+  test_HYDROGUI_BathymetryPrs.h
 
   test_Dependencies.h
   test_HYDROData_DTM.h
+  test_HYDROData_BoundaryPolygons.h
+  test_GraphicsView.h
+  test_Overview.h
 
   TestShape.h
   TestViewer.h
@@ -46,12 +53,18 @@ set(PROJECT_SOURCES
   test_HYDROData_ShapeFile.cxx
   test_HYDROData_StricklerTable.cxx
   test_HYDROData_DTM.cxx
+  test_HYDROData_BoundaryPolygons.cxx
   test_HYDROGUI_ListModel.cxx
   test_HYDROGUI_Shape.cxx
   test_HYDROGUI_LandCoverMapDlg.cxx
   test_HYDROData_CalcCase.cxx
   test_HYDROData_Stream.cxx
   test_Dependencies.cxx
+  test_HYDROData_Tool.cxx
+  test_GraphicsView.cxx
+  test_Overview.cxx
+  test_HYDROGUI_ProfilesDlg.cxx
+  test_HYDROGUI_BathymetryPrs.cxx
 
   TestShape.cxx
   TestViewer.cxx
@@ -59,8 +72,7 @@ set(PROJECT_SOURCES
   TestLib_Runner.cxx
 )
 
-add_definitions(
-  -DLIGHT_MODE -DHYDRODATA_STATIC -DHYDROGUI_STATIC )
+add_definitions( -DLIGHT_MODE -DHYDRODATA_STATIC -DHYDROGUI_STATIC -DTEST_MODE -DQT_GUI_LIB -DQT_WIDGETS_LIB )
 
 IF( ${WIN32} )
   add_definitions( -DWNT -D__WIN32__ -D__x86__ -D_WIN64 -D_WIN32_WINNT=0x0400 -D__NT__ -D__OSVERSION__=4 )
@@ -68,36 +80,52 @@ ENDIF()
 
 SET( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT}/include )
 SET( CAS_INCLUDES $ENV{CASROOT}/inc )
-SET( QT_INCLUDES $ENV{QTDIR}/include $ENV{QTDIR}/include/QtCore $ENV{QTDIR}/include/QtGui $ENV{QTDIR}/include/QtTest )
+SET( QT_INCLUDES $ENV{QTDIR}/include $ENV{QT_ROOT_DIR}/include $ENV{QT_ROOT_DIR}/include/QtCore $ENV{QT_ROOT_DIR}/include/QtGui $ENV{QT_ROOT_DIR}/include/QtTest )
 SET( KERNEL_INCLUDES $ENV{KERNEL_ROOT_DIR}/include/salome )
 SET( GUI_INCLUDES $ENV{GUI_ROOT_DIR}/include/salome )
 SET( GEOM_INCLUDES $ENV{GEOM_ROOT_DIR}/include/salome )
+SET( ECW_INCLUDES $ENV{ECWLIB_ROOT_DIR}/include )
 
 IF( ${WIN32} )
-  link_directories( $ENV{CASROOT}/win32/libd )
+  link_directories( $ENV{CASROOT}/win64/lib/vc10 $ENV{GL2PS_DIR}/lib )
 ELSE()
-  link_directories( $ENV{CASROOT}/lib )
+  link_directories( $ENV{CASROOT}/lib $ENV{TBB_ROOT_DIR}/lib/intel64/gcc4.4 )
 ENDIF()
-SET( CAS_LIBRARIES TKernel TKLCAF TKCAF TKCDF TKMath TKG2d TKG3d TKBRep TKGeomBase TKTopAlgo TKGeomAlgo TKBool TKShHealing TKXSBase TKOffset TKHLR TKBO TKV3d TKService TKMesh )
+SET( CAS_LIBRARIES TKernel TKLCAF TKCAF TKCDF TKMath TKG2d TKG3d TKBRep TKGeomBase TKTopAlgo TKGeomAlgo TKBool TKShHealing TKXSBase TKOffset TKHLR TKBO TKV3d TKService TKMesh gl2ps )
 
-link_directories( $ENV{QTDIR}/lib )
+link_directories( $ENV{QT_ROOT_DIR}/lib $ENV{QTDIR}/lib )
 IF( ${WIN32} )
-  SET( QT_LIBRARIES QtCored4 QtGuid4 QtTestd4 )
+  SET( QT_LIBRARIES Qt5Cored Qt5Guid Qt5Testd )
 ELSE()
-  SET( QT_LIBRARIES QtCore QtGui QtTest )
+  SET( QT_LIBRARIES Qt5Core Qt5Gui Qt5Test )
 ENDIF()
 
+
 link_directories( $ENV{CPPUNIT_ROOT}/lib )
 IF( ${WIN32} )
-  SET( CPPUNIT_LIBRARIES cppunitd )
+  IF( CMAKE_BUILD_TYPE MATCHES Debug )
+    SET( CPPUNIT_LIBRARIES cppunitd )
+  ELSE()
+    SET( CPPUNIT_LIBRARIES cppunit )
+  ENDIF()
 ELSE()
   SET( CPPUNIT_LIBRARIES cppunit )
 ENDIF()
 
 link_directories( $ENV{KERNEL_ROOT_DIR}/lib/salome $ENV{GUI_ROOT_DIR}/lib/salome $ENV{GEOM_ROOT_DIR}/lib/salome )
-SET( GUI_LIBRARIES ImageComposer qtx suit LightApp CAM OCCViewer )
+
+SET( GUI_LIBRARIES ImageComposer qtx suit CAM OCCViewer GraphicsView )
+# Please do not link with LightApp since in the full SALOME it is linked with CORBA (omniORB)
+
 SET( GEOM_LIBRARIES CurveCreator GEOMUtils )
 
+link_directories( $ENV{ECWLIB_ROOT_DIR}/lib )
+IF( ${WIN32} )
+  SET( ECW_LIBRARIES libecwj2 )
+ELSE()
+  SET( ECW_LIBRARIES ecwj2 )
+ENDIF()
+
 include_directories(
   ${CAS_INCLUDES}
   ${QT_INCLUDES}
@@ -108,16 +136,13 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData
   ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROGUI
   ${CMAKE_CURRENT_SOURCE_DIR}/../shapelib
+  ${ECW_INCLUDES}
 )
 
 source_group( "External files" FILES ${EXTERNAL_FILES} )
 
 add_executable( HYDROData_tests ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${EXTERNAL_FILES} ${PROJECT_MOC_HEADERS} )
-target_link_libraries( HYDROData_tests ${GUI_LIBRARIES} ${GEOM_LIBRARIES} ${CAS_LIBRARIES} ${QT_LIBRARIES} ${CPPUNIT_LIBRARIES} shapelib )
-
-#IF( ${WIN32} )
-#  add_custom_command( TARGET HYDROData_tests POST_BUILD COMMAND $(TargetPath) COMMENT "Running tests" )
-#ENDIF()
+set_target_properties( HYDROData_tests PROPERTIES LINK_INTERFACE_LIBRARIES "" )
+target_link_libraries( HYDROData_tests ${GUI_LIBRARIES} ${GEOM_LIBRARIES} ${CAS_LIBRARIES} ${QT_LIBRARIES} ${CPPUNIT_LIBRARIES} shapelib ${ECW_LIBRARIES} )
 
-#SET( INSTALL_BINS $ENV{HYDRO_ROOT_DIR}/bin/salome )
 INSTALL(TARGETS HYDROData_tests EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})