Merge branch 'V9_8_BR'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7fd2f8c2fccf5d0665c383d0ce34497ac5c2b6e8..67837fe4920fb1cf3b83faf363327909d5baf462 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ ENDIF()
 
 # Versioning
 # ===========
-SALOME_SETUP_VERSION(9.8.0)
+SALOME_SETUP_VERSION(9.8.0 DEVELOPMENT)
 MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"")
 
 # Find KERNEL

diff --git a/src/HOMARDGUI/HOMARDGUI.cxx b/src/HOMARDGUI/HOMARDGUI.cxx
index 480dff2427364969839c7b17008b1098b9a36726..a0759a26c39b1f665e697a6931860bf6c40c3bbe 100644 (file)
--- a/src/HOMARDGUI/HOMARDGUI.cxx
+++ b/src/HOMARDGUI/HOMARDGUI.cxx
@@ -24,8 +24,7 @@
 #include "HOMARDGUI.h"
 
 // SALOME Includes
-#include "Utils_ORB_INIT.hxx"
-#include "Utils_SINGLETON.hxx"
+#include "OpUtil.hxx"
 #include "SALOME_LifeCycleCORBA.hxx"
 
 #include "SUIT_ResourceMgr.h"
@@ -721,9 +720,7 @@ void HOMARDGUI::setOrb()
 {
   try
   {
-     ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance();
-     ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting());
-     _orb = init( 0 , 0 );
+     _orb = KERNEL::GetRefToORB();
   }
   catch (...)
   {

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 99f9795bb7325d41250e27be08723fb33674b330..d17e1fcaeb7d3e5aacaa07bf45a2ecb5f7a9c128 100644 (file)
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -17,15 +17,18 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF(SALOME_BUILD_TESTS)
-  ADD_SUBDIRECTORY(Test)
-ENDIF(SALOME_BUILD_TESTS)
+IF(MED_INT_IS_LONG)
+  # Homard tests are unavailable if medfile is built with 32-bits UIDs
+  IF(SALOME_BUILD_TESTS)
+    ADD_SUBDIRECTORY(Test)
+  ENDIF(SALOME_BUILD_TESTS)
 
-FILE(GLOB sample_files
-  ${PROJECT_SOURCE_DIR}/src/tests/samples/*.med
-  ${PROJECT_SOURCE_DIR}/src/tests/samples/*.bilan
-  ${PROJECT_SOURCE_DIR}/src/tests/samples/*.odt
-  ${PROJECT_SOURCE_DIR}/src/tests/samples/*.pdf
-  ${PROJECT_SOURCE_DIR}/src/tests/samples/*.png
-  ${PROJECT_SOURCE_DIR}/src/tests/samples/*.xao)
-INSTALL(FILES ${sample_files} DESTINATION ${SALOME_HOMARD_INSTALL_SAMPLES})
+  FILE(GLOB sample_files
+    ${PROJECT_SOURCE_DIR}/src/tests/samples/*.med
+    ${PROJECT_SOURCE_DIR}/src/tests/samples/*.bilan
+    ${PROJECT_SOURCE_DIR}/src/tests/samples/*.odt
+    ${PROJECT_SOURCE_DIR}/src/tests/samples/*.pdf
+    ${PROJECT_SOURCE_DIR}/src/tests/samples/*.png
+    ${PROJECT_SOURCE_DIR}/src/tests/samples/*.xao)
+  INSTALL(FILES ${sample_files} DESTINATION ${SALOME_HOMARD_INSTALL_SAMPLES})
+ENDIF(MED_INT_IS_LONG)