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
update of HYDRO code for Windows compilation
[modules/hydro.git]
/
src
/
HYDRO_tests
/
CMakeLists.txt
diff --git
a/src/HYDRO_tests/CMakeLists.txt
b/src/HYDRO_tests/CMakeLists.txt
index 47a3e94279e3af65b92317c82677a396f05984a0..1a6f2cf8a01490268f91962bcb3852a42fe45a93 100644
(file)
--- a/
src/HYDRO_tests/CMakeLists.txt
+++ b/
src/HYDRO_tests/CMakeLists.txt
@@
-19,6
+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_HYDROData_Stream.h
+ test_HYDROData_Tool.h
+
test_Dependencies.h
test_HYDROData_DTM.h
test_Dependencies.h
test_HYDROData_DTM.h
@@
-28,7
+32,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
@@
-46,20
+50,21
@@
set(PROJECT_SOURCES
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
test_Dependencies.cxx
-
+ test_HYDROData_Tool.cxx
+
TestShape.cxx
TestViewer.cxx
TestLib_Listener.cxx
TestLib_Runner.cxx
)
TestShape.cxx
TestViewer.cxx
TestLib_Listener.cxx
TestLib_Runner.cxx
)
-add_definitions(
- -DLIGHT_MODE -DHYDRODATA_STATIC -DHYDROGUI_STATIC -D__WIN32__ -D__x86__ -D_WIN64 -D_WIN32_WINNT=0x0400 -D__NT__ -D__OSVERSION__=4
-)
+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()
SET( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT_DIR}/include )
ENDIF()
SET( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT_DIR}/include )
@@
-70,15
+75,15
@@
SET( GUI_INCLUDES $ENV{GUI_ROOT_DIR}/include/salome )
SET( GEOM_INCLUDES $ENV{GEOM_ROOT_DIR}/include/salome )
IF( ${WIN32} )
SET( GEOM_INCLUDES $ENV{GEOM_ROOT_DIR}/include/salome )
IF( ${WIN32} )
- link_directories( $ENV{CASROOT}/win
32/libd
)
+ link_directories( $ENV{CASROOT}/win
64/vc10/lib
)
ELSE()
ELSE()
- link_directories( $ENV{CASROOT}/lib )
+ link_directories( $ENV{CASROOT}/lib
$ENV{TBB_ROOT_DIR}/lib/intel64/gcc4.4
)
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{QT_ROOT_DIR}/lib )
IF( ${WIN32} )
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{QT_ROOT_DIR}/lib )
IF( ${WIN32} )
- SET( QT_LIBRARIES Qt
Cored4 QtGuid4 QtTestd4
)
+ SET( QT_LIBRARIES Qt
5Cored Qt5Guid Qt5Testd
)
ELSE()
SET( QT_LIBRARIES QtCore QtGui QtTest )
ENDIF()
ELSE()
SET( QT_LIBRARIES QtCore QtGui QtTest )
ENDIF()
@@
-92,7
+97,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 G
eom
Utils )
+SET( GEOM_LIBRARIES CurveCreator G
EOMUtils GEOM
Utils )
include_directories(
${CAS_INCLUDES}
include_directories(
${CAS_INCLUDES}
@@
-109,10
+114,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 )
-
-#IF( ${WIN32} )
-# add_custom_command( TARGET HYDROData_tests POST_BUILD COMMAND $(TargetPath) COMMENT "Running tests" )
-#ENDIF()
+target_link_libraries( HYDROData_tests ${GUI_LIBRARIES} ${GEOM_LIBRARIES} ${CAS_LIBRARIES} ${QT_LIBRARIES} ${CPPUNIT_LIBRARIES} shapelib HYDROData )
INSTALL(TARGETS HYDROData_tests EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
INSTALL(TARGETS HYDROData_tests EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})