X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FHYDRO_tests%2FCMakeLists.txt;h=07fa477d001eec583bb3747117774a20b1577ad5;hb=71ba58001e1084f0995fff43bf5e4643b153e5e0;hp=7f1e99b18b9bf961c8536cb089bc81f5992f0405;hpb=07ccf1206abd36c104230ae2051110e8e2bf27c0;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt
index 7f1e99b1..07fa477d 100644
--- a/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 include(../../CMake/Common.cmake)
 include(ExternalFiles.cmake)
 
@@ -15,6 +16,8 @@ set(PROJECT_HEADERS
   test_HYDROData_ShapeFile.h
   test_HYDROData_StricklerTable.h
   test_HYDROGUI_ListModel.h
+  test_HYDROGUI_Shape.h
+  test_HYDROGUI_LandCoverMapDlg.h
   test_Dependencies.h
 
   TestShape.h
@@ -38,6 +41,8 @@ set(PROJECT_SOURCES
   test_HYDROData_ShapeFile.cxx
   test_HYDROData_StricklerTable.cxx
   test_HYDROGUI_ListModel.cxx
+  test_HYDROGUI_Shape.cxx
+  test_HYDROGUI_LandCoverMapDlg.cxx
   test_Dependencies.cxx
 
   TestShape.cxx
@@ -54,42 +59,45 @@ IF( ${WIN32} )
   add_definitions( -DWNT )
 ENDIF()
 
-SET( BOOST_INCLUDES $ENV{BOOST_ROOT_DIR}/include/boost-1_52 )
-SET( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT_DIR}/include )
-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 $ENV{QT4_ROOT_DIR}/include/QtTest )
+SET( BOOST_INCLUDES $ENV{BOOST_ROOT}/include/boost-1_52 )
+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( GUI_INCLUDES $ENV{GUI_ROOT_DIR}/include/salome )
+SET( GEOM_INCLUDES $ENV{GEOM_ROOT_DIR}/include/salome )
 
 IF( ${WIN32} )
-  link_directories( $ENV{CAS_ROOT_DIR}/win32/libd )
+  link_directories( $ENV{CASROOT}/win32/libd )
 ELSE()
-  link_directories( $ENV{CAS_ROOT_DIR}/lib )
+  link_directories( $ENV{CASROOT}/lib )
 ENDIF()
 SET( CAS_LIBRARIES TKernel TKLCAF TKCAF TKCDF TKMath TKG2d TKG3d TKBRep TKGeomBase TKTopAlgo TKGeomAlgo TKBool TKShHealing TKXSBase TKOffset TKHLR TKBO TKV3d TKService TKMesh )
 
-link_directories( $ENV{QT4_ROOT_DIR}/lib )
+link_directories( $ENV{QTDIR}/lib )
 IF( ${WIN32} )
   SET( QT_LIBRARIES QtCored4 QtGuid4 QtTestd4 )
 ELSE()
   SET( QT_LIBRARIES QtCore QtGui QtTest )
 ENDIF()
 
-link_directories( $ENV{CPPUNIT_ROOT_DIR}/lib )
+link_directories( $ENV{CPPUNIT_ROOT}/lib )
 IF( ${WIN32} )
   SET( CPPUNIT_LIBRARIES cppunitd )
 ELSE()
   SET( CPPUNIT_LIBRARIES cppunit )
 ENDIF()
 
-link_directories( $ENV{GUI_ROOT_DIR}/lib/salome )
+link_directories( $ENV{GUI_ROOT_DIR}/lib/salome $ENV{GEOM_ROOT_DIR}/lib/salome )
 SET( GUI_LIBRARIES ImageComposer qtx suit LightApp CAM OCCViewer )
+SET( GEOM_LIBRARIES CurveCreator )
 
 include_directories(
   ${BOOST_INCLUDES}
-  ${CAS_INCLUDE_DIRS}
+  ${CAS_INCLUDES}
   ${QT_INCLUDES}
   ${CPPUNIT_INCLUDES}
   ${GUI_INCLUDES}
+  ${GEOM_INCLUDES}
   ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData
   ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROGUI
   ${CMAKE_CURRENT_SOURCE_DIR}/../shapelib
@@ -97,8 +105,8 @@ include_directories(
 
 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 )
+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 HYDROData)
 
 IF( ${WIN32} )
   add_custom_command( TARGET HYDROData_tests POST_BUILD COMMAND $(TargetPath) COMMENT "Running tests" )