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_MULTI_BATHS' into HEAD
[modules/hydro.git]
/
src
/
HYDRO_tests
/
CMakeLists.txt
diff --git
a/src/HYDRO_tests/CMakeLists.txt
b/src/HYDRO_tests/CMakeLists.txt
index 8a33dba07f25ee861e46e8afbef2d74eb3b84428..f220d40163d9a1d2a3d6c95832d1a473caabd2c3 100644
(file)
--- a/
src/HYDRO_tests/CMakeLists.txt
+++ b/
src/HYDRO_tests/CMakeLists.txt
@@
-19,7
+19,10
@@
set(PROJECT_HEADERS
test_HYDROGUI_ListModel.h
test_HYDROGUI_Shape.h
test_HYDROGUI_LandCoverMapDlg.h
test_HYDROGUI_ListModel.h
test_HYDROGUI_Shape.h
test_HYDROGUI_LandCoverMapDlg.h
+ test_HYDROData_CalcCase.h
+
test_Dependencies.h
test_Dependencies.h
+ test_HYDROData_DTM.h
TestShape.h
TestViewer.h
TestShape.h
TestViewer.h
@@
-41,9
+44,11
@@
set(PROJECT_SOURCES
test_HYDROData_Profile.cxx
test_HYDROData_ShapeFile.cxx
test_HYDROData_StricklerTable.cxx
test_HYDROData_Profile.cxx
test_HYDROData_ShapeFile.cxx
test_HYDROData_StricklerTable.cxx
+ test_HYDROData_DTM.cxx
test_HYDROGUI_ListModel.cxx
test_HYDROGUI_Shape.cxx
test_HYDROGUI_LandCoverMapDlg.cxx
test_HYDROGUI_ListModel.cxx
test_HYDROGUI_Shape.cxx
test_HYDROGUI_LandCoverMapDlg.cxx
+ test_HYDROData_CalcCase.cxx
test_Dependencies.cxx
TestShape.cxx
test_Dependencies.cxx
TestShape.cxx
@@
-90,7
+95,7
@@
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 )
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( GEOM_LIBRARIES CurveCreator )
+SET( GEOM_LIBRARIES CurveCreator
GeomUtils
)
include_directories(
${CAS_INCLUDES}
include_directories(
${CAS_INCLUDES}
@@
-107,7
+112,7
@@
include_directories(
source_group( "External files" FILES ${EXTERNAL_FILES} )
add_executable( HYDROData_tests ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${EXTERNAL_FILES} ${PROJECT_MOC_HEADERS} )
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
HYDROData
)
+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" )