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
Fix merge errors.
[modules/hydro.git]
/
src
/
HYDRO_tests
/
CMakeLists.txt
diff --git
a/src/HYDRO_tests/CMakeLists.txt
b/src/HYDRO_tests/CMakeLists.txt
index 07fa477d001eec583bb3747117774a20b1577ad5..041a55d0ca385349fb5b6495a50d57e3470e632d 100644
(file)
--- a/
src/HYDRO_tests/CMakeLists.txt
+++ b/
src/HYDRO_tests/CMakeLists.txt
@@
-1,3
+1,4
@@
+ADD_SUBDIRECTORY(reference_data)
include(../../CMake/Common.cmake)
include(ExternalFiles.cmake)
include(../../CMake/Common.cmake)
include(ExternalFiles.cmake)
@@
-18,7
+19,11
@@
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_HYDROData_Stream.h
+
test_Dependencies.h
test_Dependencies.h
+ test_HYDROData_DTM.h
TestShape.h
TestViewer.h
TestShape.h
TestViewer.h
@@
-26,7
+31,7
@@
set(PROJECT_HEADERS
TestLib_Runner.h
)
TestLib_Runner.h
)
-set(PROJECT_SOURCES
+set(PROJECT_SOURCES
test_HYDROData_Bathymetry.cxx
test_HYDROData_Channel.cxx
test_HYDROData_Document.cxx
test_HYDROData_Bathymetry.cxx
test_HYDROData_Channel.cxx
test_HYDROData_Document.cxx
@@
-40,9
+45,12
@@
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_HYDROData_Stream.cxx
test_Dependencies.cxx
TestShape.cxx
test_Dependencies.cxx
TestShape.cxx
@@
-51,18
+59,16
@@
set(PROJECT_SOURCES
TestLib_Runner.cxx
)
TestLib_Runner.cxx
)
-add_definitions(
- -DLIGHT_MODE -DHYDRODATA_STATIC -DHYDROGUI_STATIC
-)
+add_definitions( -DLIGHT_MODE -DHYDRODATA_STATIC -DHYDROGUI_STATIC )
IF( ${WIN32} )
IF( ${WIN32} )
- add_definitions( -DWNT )
+ add_definitions( -DWNT
-D__WIN32__ -D__x86__ -D_WIN64 -D_WIN32_WINNT=0x0400 -D__NT__ -D__OSVERSION__=4
)
ENDIF()
ENDIF()
-SET( BOOST_INCLUDES $ENV{BOOST_ROOT}/include/boost-1_52 )
SET( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT}/include )
SET( CAS_INCLUDES $ENV{CASROOT}/inc )
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{QT5_ROOT_DIR}/include $ENV{QT5_ROOT_DIR}/include/QtCore $ENV{QT5_ROOT_DIR}/include/QtGui $ENV{QT5_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( GUI_INCLUDES $ENV{GUI_ROOT_DIR}/include/salome )
SET( GEOM_INCLUDES $ENV{GEOM_ROOT_DIR}/include/salome )
@@
-73,7
+79,7
@@
ELSE()
ENDIF()
SET( CAS_LIBRARIES TKernel TKLCAF TKCAF TKCDF TKMath TKG2d TKG3d TKBRep TKGeomBase TKTopAlgo TKGeomAlgo TKBool TKShHealing TKXSBase TKOffset TKHLR TKBO TKV3d TKService TKMesh )
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{QTDIR}/lib )
+link_directories( $ENV{QT
5_ROOT_
DIR}/lib )
IF( ${WIN32} )
SET( QT_LIBRARIES QtCored4 QtGuid4 QtTestd4 )
ELSE()
IF( ${WIN32} )
SET( QT_LIBRARIES QtCored4 QtGuid4 QtTestd4 )
ELSE()
@@
-87,15
+93,15
@@
ELSE()
SET( CPPUNIT_LIBRARIES cppunit )
ENDIF()
SET( CPPUNIT_LIBRARIES cppunit )
ENDIF()
-link_directories( $ENV{GUI_ROOT_DIR}/lib/salome $ENV{GEOM_ROOT_DIR}/lib/salome )
+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 LightApp CAM OCCViewer )
-SET( GEOM_LIBRARIES CurveCreator )
+SET( GEOM_LIBRARIES CurveCreator
GEOMUtils GEOMUtils
)
include_directories(
include_directories(
- ${BOOST_INCLUDES}
${CAS_INCLUDES}
${QT_INCLUDES}
${CPPUNIT_INCLUDES}
${CAS_INCLUDES}
${QT_INCLUDES}
${CPPUNIT_INCLUDES}
+ ${KERNEL_INCLUDES}
${GUI_INCLUDES}
${GEOM_INCLUDES}
${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData
${GUI_INCLUDES}
${GEOM_INCLUDES}
${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData
@@
-106,8
+112,6
@@
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 HYDROData
)
-IF( ${WIN32} )
- add_custom_command( TARGET HYDROData_tests POST_BUILD COMMAND $(TargetPath) COMMENT "Running tests" )
-ENDIF()
+INSTALL(TARGETS HYDROData_tests EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})