Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
[modules/hydro.git]
/
src
/
HYDRO_tests
/
CMakeLists.txt
diff --git
a/src/HYDRO_tests/CMakeLists.txt
b/src/HYDRO_tests/CMakeLists.txt
index 08731d0fa169e5ce7e19f774e2a0597eb5858be9..167285a9af7792c73996734f3b7a67d797a8a323 100644
(file)
--- a/
src/HYDRO_tests/CMakeLists.txt
+++ b/
src/HYDRO_tests/CMakeLists.txt
@@
-3,6
+3,7
@@
include(ExternalFiles.cmake)
set(PROJECT_HEADERS
test_HYDROData_Bathymetry.h
set(PROJECT_HEADERS
test_HYDROData_Bathymetry.h
+ test_HYDROData_Channel.h
test_HYDROData_Document.h
test_HYDROData_Entity.h
test_HYDROData_Image.h
test_HYDROData_Document.h
test_HYDROData_Entity.h
test_HYDROData_Image.h
@@
-11,9
+12,12
@@
set(PROJECT_HEADERS
test_HYDROData_OperationsFactory.h
test_HYDROData_PolylineXY.h
test_HYDROData_Profile.h
test_HYDROData_OperationsFactory.h
test_HYDROData_PolylineXY.h
test_HYDROData_Profile.h
+ test_HYDROData_ShapeFile.h
test_HYDROData_StricklerTable.h
test_HYDROGUI_ListModel.h
test_HYDROData_StricklerTable.h
test_HYDROGUI_ListModel.h
+ test_Dependencies.h
+ TestShape.h
TestViewer.h
TestLib_Listener.h
TestLib_Runner.h
TestViewer.h
TestLib_Listener.h
TestLib_Runner.h
@@
-21,6
+25,7
@@
set(PROJECT_HEADERS
set(PROJECT_SOURCES
test_HYDROData_Bathymetry.cxx
set(PROJECT_SOURCES
test_HYDROData_Bathymetry.cxx
+ test_HYDROData_Channel.cxx
test_HYDROData_Document.cxx
test_HYDROData_Entity.cxx
test_HYDROData_Image.cxx
test_HYDROData_Document.cxx
test_HYDROData_Entity.cxx
test_HYDROData_Image.cxx
@@
-30,9
+35,12
@@
set(PROJECT_SOURCES
test_HYDROData_OperationsFactory.cxx
test_HYDROData_PolylineXY.cxx
test_HYDROData_Profile.cxx
test_HYDROData_OperationsFactory.cxx
test_HYDROData_PolylineXY.cxx
test_HYDROData_Profile.cxx
+ test_HYDROData_ShapeFile.cxx
test_HYDROData_StricklerTable.cxx
test_HYDROGUI_ListModel.cxx
test_HYDROData_StricklerTable.cxx
test_HYDROGUI_ListModel.cxx
+ test_Dependencies.cxx
+ TestShape.cxx
TestViewer.cxx
TestLib_Listener.cxx
TestLib_Runner.cxx
TestViewer.cxx
TestLib_Listener.cxx
TestLib_Runner.cxx
@@
-48,22
+56,23
@@
ENDIF()
SET( BOOST_INCLUDES $ENV{BOOST_ROOT_DIR}/include/boost-1_52 )
SET( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT_DIR}/include )
SET( BOOST_INCLUDES $ENV{BOOST_ROOT_DIR}/include/boost-1_52 )
SET( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT_DIR}/include )
-SET( CAS_INCLUDES $ENV{CASROOT_DIR}/inc )
-SET( QT_INCLUDES $ENV{QT4_ROOT_DIR}/include $ENV{QT4_ROOT_DIR}/include/QtCore $ENV{QT4_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
$ENV{QT4_ROOT_DIR}/include/QtTest
)
SET( GUI_INCLUDES $ENV{GUI_ROOT_DIR}/include/salome )
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 )
ELSE()
link_directories( $ENV{CAS_ROOT_DIR}/lib )
ENDIF()
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 )
+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 )
IF( ${WIN32} )
link_directories( $ENV{QT4_ROOT_DIR}/lib )
IF( ${WIN32} )
- SET( QT_LIBRARIES QtCored4 QtGuid4 )
+ SET( QT_LIBRARIES QtCored4 QtGuid4
QtTestd4
)
ELSE()
ELSE()
- SET( QT_LIBRARIES QtCore QtGui )
+ SET( QT_LIBRARIES QtCore QtGui
QtTest
)
ENDIF()
link_directories( $ENV{CPPUNIT_ROOT_DIR}/lib )
ENDIF()
link_directories( $ENV{CPPUNIT_ROOT_DIR}/lib )
@@
-73,15
+82,17
@@
ELSE()
SET( CPPUNIT_LIBRARIES cppunit )
ENDIF()
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( GUI_LIBRARIES ImageComposer qtx suit LightApp CAM OCCViewer )
+SET( GEOM_LIBRARIES CurveCreator )
include_directories(
${BOOST_INCLUDES}
include_directories(
${BOOST_INCLUDES}
- ${CAS_INCLUDE
_DIR
S}
+ ${CAS_INCLUDES}
${QT_INCLUDES}
${CPPUNIT_INCLUDES}
${GUI_INCLUDES}
${QT_INCLUDES}
${CPPUNIT_INCLUDES}
${GUI_INCLUDES}
+ ${GEOM_INCLUDES}
${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData
${CMAKE_CURRENT_SOURCE_DIR}/../HYDROGUI
${CMAKE_CURRENT_SOURCE_DIR}/../shapelib
${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData
${CMAKE_CURRENT_SOURCE_DIR}/../HYDROGUI
${CMAKE_CURRENT_SOURCE_DIR}/../shapelib
@@
-90,7
+101,7
@@
include_directories(
source_group( "External files" FILES ${EXTERNAL_FILES} )
add_executable( HYDROData_tests ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${EXTERNAL_FILES} )
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 )
+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" )
IF( ${WIN32} )
add_custom_command( TARGET HYDROData_tests POST_BUILD COMMAND $(TargetPath) COMMENT "Running tests" )