X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2FCMakeLists.txt;h=8916171a50ea7a892ec1e935be4b59ac7648c54c;hb=f709724a7a412254db7ee6ca094b01b6dc75e82b;hp=657f9a173b2fc15740640b88cdd26aff3a01e985;hpb=6e821f3c2b6ef1e29bd597c90a70c2b47472775d;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt
index 657f9a17..8916171a 100644
--- a/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@ -1,19 +1,23 @@
+include(../../CMake/Common.cmake)
 include(ExternalFiles.cmake)
 
 set(PROJECT_HEADERS
-  operators.h
   test_HYDROData_Bathymetry.h
   test_HYDROData_Document.h
   test_HYDROData_Entity.h
   test_HYDROData_Image.h
   test_HYDROData_Iterator.h
+  test_HYDROData_LandCoverMap.h
   test_HYDROData_OperationsFactory.h
   test_HYDROData_PolylineXY.h
   test_HYDROData_Profile.h
   test_HYDROData_StricklerTable.h
   test_HYDROGUI_ListModel.h
+  test_Dependencies.h
 
   TestViewer.h
+  TestLib_Listener.h
+  TestLib_Runner.h
 )
 
 set(PROJECT_SOURCES 
@@ -22,16 +26,18 @@ set(PROJECT_SOURCES
   test_HYDROData_Entity.cxx
   test_HYDROData_Image.cxx
   test_HYDROData_Iterator.cxx
+  test_HYDROData_LandCoverMap.cxx
   test_HYDROData_Main.cxx
   test_HYDROData_OperationsFactory.cxx
   test_HYDROData_PolylineXY.cxx
   test_HYDROData_Profile.cxx
   test_HYDROData_StricklerTable.cxx
   test_HYDROGUI_ListModel.cxx
-
-  ${EXTERNAL_FILES}
+  test_Dependencies.cxx
 
   TestViewer.cxx
+  TestLib_Listener.cxx
+  TestLib_Runner.cxx
 )
 
 add_definitions(
@@ -44,20 +50,33 @@ ENDIF()
 
 SET( BOOST_INCLUDES $ENV{BOOST_ROOT_DIR}/include/boost-1_52 )
 SET( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT_DIR}/include )
-SET( QT_INCLUDES $ENV{QT_ROOT_DIR}/include $ENV{QT_ROOT_DIR}/include/QtCore $ENV{QT_ROOT_DIR}/include/QtGui )
+SET( CAS_INCLUDES $ENV{CAS_ROOT_DIR}/inc )
+SET( QT_INCLUDES $ENV{QT4_ROOT_DIR}/include $ENV{QT4_ROOT_DIR}/include/QtCore $ENV{QT4_ROOT_DIR}/include/QtGui )
 SET( GUI_INCLUDES $ENV{GUI_ROOT_DIR}/include/salome )
 
-link_directories( $ENV{CAS_ROOT_DIR}/win32/libd )  #TODO: more correct for release, linux etc
+IF( ${WIN32} )
+  link_directories( $ENV{CAS_ROOT_DIR}/win32/libd )
+ELSE()
+  link_directories( $ENV{CAS_ROOT_DIR}/lib )
+ENDIF()
 SET( CAS_LIBRARIES TKernel TKLCAF TKCAF TKCDF TKMath TKG2d TKG3d TKBRep TKGeomBase TKTopAlgo TKGeomAlgo TKBool TKShHealing TKXSBase TKOffset TKHLR TKBO TKV3d )
 
-link_directories( $ENV{QT_ROOT_DIR}/lib )
-SET( QT_LIBRARIES QtCored4 QtGuid4 )
+link_directories( $ENV{QT4_ROOT_DIR}/lib )
+IF( ${WIN32} )
+  SET( QT_LIBRARIES QtCored4 QtGuid4 )
+ELSE()
+  SET( QT_LIBRARIES QtCore QtGui )
+ENDIF()
 
 link_directories( $ENV{CPPUNIT_ROOT_DIR}/lib )
-SET( CPPUNIT_LIBRARIES cppunitd )
+IF( ${WIN32} )
+  SET( CPPUNIT_LIBRARIES cppunitd )
+ELSE()
+  SET( CPPUNIT_LIBRARIES cppunit )
+ENDIF()
 
 link_directories( $ENV{GUI_ROOT_DIR}/lib/salome )
-SET( GUI_LIBRARIES ImageComposer Qtx SUIT LightApp CAM OCCViewer )
+SET( GUI_LIBRARIES ImageComposer qtx suit LightApp CAM OCCViewer )
 
 include_directories(
   ${BOOST_INCLUDES}
@@ -65,13 +84,14 @@ include_directories(
   ${QT_INCLUDES}
   ${CPPUNIT_INCLUDES}
   ${GUI_INCLUDES}
-  ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData
   ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROGUI
   ${CMAKE_CURRENT_SOURCE_DIR}/../shapelib
 )
 
-add_executable( HYDROData_tests ${PROJECT_SOURCES} ${PROJECT_HEADERS})
+source_group( "External files" FILES ${EXTERNAL_FILES} )
+
+add_executable( HYDROData_tests ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${EXTERNAL_FILES} )
 target_link_libraries( HYDROData_tests ${GUI_LIBRARIES} ${CAS_LIBRARIES} ${QT_LIBRARIES} ${CPPUNIT_LIBRARIES} shapelib )
 
 IF( ${WIN32} )