analyse HYDRO_tests

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c8dbcd844e79d5d869fdeb5ed16e6ad69aa57d1..b7bfb7448a6e56ae1f45407b05a19b1ad18bf897 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -201,11 +201,11 @@ MARK_AS_ADVANCED(
 # Sources
 # ========
 ADD_SUBDIRECTORY (src/shapelib)
 # Sources
 # ========
 ADD_SUBDIRECTORY (src/shapelib)

-ADD_SUBDIRECTORY (src/HYDRO_tests)

 ADD_SUBDIRECTORY (src/HYDROData)
 ADD_SUBDIRECTORY (src/HYDROGUI)
 ADD_SUBDIRECTORY (src/HYDROPy)
 ADD_SUBDIRECTORY (src/HYDROTools)
 ADD_SUBDIRECTORY (src/HYDROData)
 ADD_SUBDIRECTORY (src/HYDROGUI)
 ADD_SUBDIRECTORY (src/HYDROPy)
 ADD_SUBDIRECTORY (src/HYDROTools)

+ADD_SUBDIRECTORY (src/HYDRO_tests)

 IF(SALOME_BUILD_DOC)
   ADD_SUBDIRECTORY(doc)
 ENDIF()
 IF(SALOME_BUILD_DOC)
   ADD_SUBDIRECTORY(doc)
 ENDIF()

diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt
index a9dfb54a6a089c0dd8c1496ef9091fde4e29ddd2..2c475866356ff7ef7427650fdbfdca7aa962f1b8 100644 (file)
--- a/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@ -73,6 +73,8 @@ set(PROJECT_SOURCES
 )
 
 add_definitions( -DLIGHT_MODE -DHYDRODATA_STATIC -DHYDROGUI_STATIC -DTEST_MODE -DQT_GUI_LIB -DQT_WIDGETS_LIB )
 )
 
 add_definitions( -DLIGHT_MODE -DHYDRODATA_STATIC -DHYDROGUI_STATIC -DTEST_MODE -DQT_GUI_LIB -DQT_WIDGETS_LIB )

+# LIGHT_MODE, TEST_MODE: recompilation d'une partie des sources HYDROData et HYDROGUI (ExternalFiles) avec ces options
+# QT_GUI_LIB, QT_WIDGETS_LIB: pas présent ailleurs dans les sources: utile ?

 
 IF( ${WIN32} )
   add_definitions( -DWNT -D__WIN32__ -D__x86__ -D_WIN64 -D_WIN32_WINNT=0x0400 -D__NT__ -D__OSVERSION__=4 )
 
 IF( ${WIN32} )
   add_definitions( -DWNT -D__WIN32__ -D__x86__ -D_WIN64 -D_WIN32_WINNT=0x0400 -D__NT__ -D__OSVERSION__=4 )


@@ -91,7 +93,34 @@ IF( ${WIN32} )
 ELSE()
   link_directories( $ENV{CASROOT}/lib $ENV{TBB_ROOT_DIR}/lib/intel64/gcc4.4 )
 ENDIF()
 ELSE()
   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 gl2ps )
+
+SET( CAS_LIBRARIES
+        TKernel
+        TKLCAF
+        TKCAF
+     TKCDF
+     TKMath
+     TKG2d
+     TKG3d
+     TKBRep
+     TKGeomBase
+     TKTopAlgo
+     TKGeomAlgo
+     TKBool
+     TKShHealing
+     TKXSBase
+     TKOffset
+     TKHLR
+     TKBO
+     TKV3d
+     TKService
+     TKMesh
+     gl2ps
+     )
+# !LIGHT_MODE
+#     TKIGES
+#     TKSTEP
+

 
 link_directories( $ENV{QT_ROOT_DIR}/lib $ENV{QTDIR}/lib )
 IF( ${WIN32} )
 
 link_directories( $ENV{QT_ROOT_DIR}/lib $ENV{QTDIR}/lib )
 IF( ${WIN32} )


@@ -112,12 +141,27 @@ ELSE()
   SET( CPPUNIT_LIBRARIES cppunit )
 ENDIF()
 
   SET( CPPUNIT_LIBRARIES cppunit )
 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 CAM OCCViewer GraphicsView )
+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
+     CAM
+     OCCViewer
+     GraphicsView
+     )

 # Please do not link with LightApp since in the full SALOME it is linked with CORBA (omniORB)
 
 # Please do not link with LightApp since in the full SALOME it is linked with CORBA (omniORB)
 

-SET( GEOM_LIBRARIES CurveCreator GEOMUtils )
+SET( GEOM_LIBRARIES
+     CurveCreator
+     GEOMUtils
+     )
+# !LIGHT_MODE
+#     GEOM
+#     GEOMBase

 
 link_directories( $ENV{ECWLIB_ROOT_DIR}/lib )
 IF( ${WIN32} )
 
 link_directories( $ENV{ECWLIB_ROOT_DIR}/lib )
 IF( ${WIN32} )


@@ -142,7 +186,22 @@ 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} )

+

 set_target_properties( HYDROData_tests PROPERTIES LINK_INTERFACE_LIBRARIES "" )
 set_target_properties( HYDROData_tests PROPERTIES LINK_INTERFACE_LIBRARIES "" )

-target_link_libraries( HYDROData_tests ${GUI_LIBRARIES} ${GEOM_LIBRARIES} ${CAS_LIBRARIES} ${QT_LIBRARIES} ${CPPUNIT_LIBRARIES} shapelib ${ECW_LIBRARIES} )
+target_link_libraries( HYDROData_tests
+                       ${GUI_LIBRARIES}
+                       ${GEOM_LIBRARIES}
+                       ${CAS_LIBRARIES}
+                       ${QT_LIBRARIES}
+                       ${CPPUNIT_LIBRARIES}
+                       shapelib
+                       ${ECW_LIBRARIES}
+                       )
+# !LIGHT_MODE
+#                       ${OMNIORB_LIBRARIES}
+#                       ${VTK_LIBRARIES}
+# using libraries instead of EXTERNAL_FILES
+#                       HYDROData
+#                       HYDROGUI

 
 INSTALL(TARGETS HYDROData_tests EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
 
 INSTALL(TARGETS HYDROData_tests EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})

diff --git a/src/HYDRO_tests/ExternalFiles.cmake b/src/HYDRO_tests/ExternalFiles.cmake
index 6a5b7e0ba3b00080e819bed489a97d664091978c..d85f0af85e313c85013b6cbff8d54603155a8f65 100644 (file)
--- a/src/HYDRO_tests/ExternalFiles.cmake
+++ b/src/HYDRO_tests/ExternalFiles.cmake
@@ -66,29 +66,38 @@ set( EXTERNAL_FILES
   ../HYDROData/HYDROData_DTM.cxx
   ../HYDROData/HYDROData_LISM.cxx
   ../HYDROData/HYDROData_StreamLinearInterpolation.cxx
   ../HYDROData/HYDROData_DTM.cxx
   ../HYDROData/HYDROData_LISM.cxx
   ../HYDROData/HYDROData_StreamLinearInterpolation.cxx

-  ../HYDROGUI/HYDROGUI_ListModel.cxx
-  ../HYDROGUI/HYDROGUI_DataObject.cxx
-  ../HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx
-  ../HYDROGUI/HYDROGUI_LandCoverArgsFilter.cxx
-  ../HYDROGUI/HYDROGUI_Polyline.cxx

   ../HYDROGUI/HYDROGUI_AISShape.cxx
   ../HYDROGUI/HYDROGUI_AISShape.cxx

-  ../HYDROGUI/HYDROGUI_Shape.cxx
-  ../HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
+  ../HYDROGUI/HYDROGUI_AISTrihedron.cxx

   ../HYDROGUI/HYDROGUI_BathymetryPrs.cxx
   ../HYDROGUI/HYDROGUI_BathymetryPrs.cxx

+  ../HYDROGUI/HYDROGUI_CurveCreatorProfile.cxx
+  ../HYDROGUI/HYDROGUI_DataObject.cxx

   ../HYDROGUI/HYDROGUI_InputPanel.cxx
   ../HYDROGUI/HYDROGUI_InputPanel.cxx

-  ../HYDROGUI/HYDROGUI_StricklerTableDlg.cxx
+  ../HYDROGUI/HYDROGUI_LandCoverArgsFilter.cxx
+  ../HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx

   ../HYDROGUI/HYDROGUI_LineEditDoubleValidator.cxx
   ../HYDROGUI/HYDROGUI_LineEditDoubleValidator.cxx

-  ../HYDROGUI/HYDROGUI_Tool.cxx
-  ../HYDROGUI/HYDROGUI_StreamDlg.cxx
+  ../HYDROGUI/HYDROGUI_ListModel.cxx

   ../HYDROGUI/HYDROGUI_ListSelector.cxx
   ../HYDROGUI/HYDROGUI_OrderedListWidget.cxx
   ../HYDROGUI/HYDROGUI_Overview.cxx
   ../HYDROGUI/HYDROGUI_ListSelector.cxx
   ../HYDROGUI/HYDROGUI_OrderedListWidget.cxx
   ../HYDROGUI/HYDROGUI_Overview.cxx

-  ../HYDROGUI/HYDROGUI_ZoneTool.cxx
+  ../HYDROGUI/HYDROGUI_Polyline.cxx

   ../HYDROGUI/HYDROGUI_ProfileDlg.cxx
   ../HYDROGUI/HYDROGUI_ProfileDlg.cxx

+  ../HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
+  ../HYDROGUI/HYDROGUI_Shape.cxx
+  ../HYDROGUI/HYDROGUI_StreamDlg.cxx
+  ../HYDROGUI/HYDROGUI_StricklerTableDlg.cxx
+  ../HYDROGUI/HYDROGUI_Tool.cxx

   ../HYDROGUI/HYDROGUI_ViewerDlg.cxx
   ../HYDROGUI/HYDROGUI_ViewerDlg.cxx

-  ../HYDROGUI/HYDROGUI_AISTrihedron.cxx
-  ../HYDROGUI/HYDROGUI_CurveCreatorProfile.cxx
+  ../HYDROGUI/HYDROGUI_ZoneTool.cxx

 )
 )

+# if not -DLIGHT_MODE, to be completed. Link with library HYDROData & HYDROGUI instead
+#  ../HYDROGUI/HYDROGUI_AbstractDisplayer.cxx
+#  ../HYDROGUI/HYDROGUI_Displayer.cxx
+#  ../HYDROGUI/HYDROGUI_Module.cxx
+#  ../HYDROGUI/HYDROGUI_OCCDisplayer.cxx
+#  ../HYDROGUI/HYDROGUI_Operations.cxx
+#  ../HYDROGUI/HYDROGUI_Tool2.cxx
+#  ../HYDROGUI/HYDROGUI_VTKPrsDisplayer.cxx
+

 
 set( MOC_HEADERS
   ../HYDROGUI/HYDROGUI_InputPanel.h
 
 set( MOC_HEADERS
   ../HYDROGUI/HYDROGUI_InputPanel.h