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 9437e76295b88ff6e64dcbd841e34c9198e2fba7..8916171a50ea7a892ec1e935be4b59ac7648c54c 100644
(file)
--- a/
src/HYDRO_tests/CMakeLists.txt
+++ b/
src/HYDRO_tests/CMakeLists.txt
@@
-1,7
+1,7
@@
+include(../../CMake/Common.cmake)
include(ExternalFiles.cmake)
set(PROJECT_HEADERS
include(ExternalFiles.cmake)
set(PROJECT_HEADERS
- operators.h
test_HYDROData_Bathymetry.h
test_HYDROData_Document.h
test_HYDROData_Entity.h
test_HYDROData_Bathymetry.h
test_HYDROData_Document.h
test_HYDROData_Entity.h
@@
-13,8
+13,11
@@
set(PROJECT_HEADERS
test_HYDROData_Profile.h
test_HYDROData_StricklerTable.h
test_HYDROGUI_ListModel.h
test_HYDROData_Profile.h
test_HYDROData_StricklerTable.h
test_HYDROGUI_ListModel.h
+ test_Dependencies.h
TestViewer.h
TestViewer.h
+ TestLib_Listener.h
+ TestLib_Runner.h
)
set(PROJECT_SOURCES
)
set(PROJECT_SOURCES
@@
-30,8
+33,11
@@
set(PROJECT_SOURCES
test_HYDROData_Profile.cxx
test_HYDROData_StricklerTable.cxx
test_HYDROGUI_ListModel.cxx
test_HYDROData_Profile.cxx
test_HYDROData_StricklerTable.cxx
test_HYDROGUI_ListModel.cxx
+ test_Dependencies.cxx
TestViewer.cxx
TestViewer.cxx
+ TestLib_Listener.cxx
+ TestLib_Runner.cxx
)
add_definitions(
)
add_definitions(
@@
-44,20
+50,33
@@
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( QT_INCLUDES $ENV{QT_ROOT_DIR}/include $ENV{QT_ROOT_DIR}/include/QtCore $ENV{QT_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 )
SET( GUI_INCLUDES $ENV{GUI_ROOT_DIR}/include/salome )
SET( GUI_INCLUDES $ENV{GUI_ROOT_DIR}/include/salome )
-link_directories( $ENV{CAS_ROOT_DIR}/win32/libd ) #TODO: more correct for release, linux etc
+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 )
-link_directories( $ENV{QT_ROOT_DIR}/lib )
-SET( QT_LIBRARIES QtCored4 QtGuid4 )
+link_directories( $ENV{QT4_ROOT_DIR}/lib )
+IF( ${WIN32} )
+ SET( QT_LIBRARIES QtCored4 QtGuid4 )
+ELSE()
+ SET( QT_LIBRARIES QtCore QtGui )
+ENDIF()
link_directories( $ENV{CPPUNIT_ROOT_DIR}/lib )
link_directories( $ENV{CPPUNIT_ROOT_DIR}/lib )
-SET( CPPUNIT_LIBRARIES cppunitd )
+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 )
-SET( GUI_LIBRARIES ImageComposer
Qtx SUIT
LightApp CAM OCCViewer )
+SET( GUI_LIBRARIES ImageComposer
qtx suit
LightApp CAM OCCViewer )
include_directories(
${BOOST_INCLUDES}
include_directories(
${BOOST_INCLUDES}
@@
-65,7
+84,6
@@
include_directories(
${QT_INCLUDES}
${CPPUNIT_INCLUDES}
${GUI_INCLUDES}
${QT_INCLUDES}
${CPPUNIT_INCLUDES}
${GUI_INCLUDES}
- ${CMAKE_CURRENT_SOURCE_DIR}
${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