#24735 [CEA][Windows] HELLO compilation issue

diff --git a/src/HELLO/CMakeLists.txt b/src/HELLO/CMakeLists.txt
index 91cb3842c38822b073f74cf319176a2f67b5d995..f8a6863ebd0a95287f8eb540a2b3f4b46e79f54a 100644 (file)
--- a/src/HELLO/CMakeLists.txt
+++ b/src/HELLO/CMakeLists.txt
@@ -38,6 +38,7 @@ SET(_link_LIBRARIES
   ${KERNEL_OpUtil}
   ${KERNEL_SalomeContainer}
   ${KERNEL_SalomeKernelHelpers}
+  ${KERNEL_SalomeDS}
   SalomeIDLHELLO
 )
 

diff --git a/src/HELLO/HELLO.cxx b/src/HELLO/HELLO.cxx
index 709f40f8e9f981f762c8aa637d253ea2550a25c1..5c7e2c602ff000009b5159fa655e2b56e5fdde1a 100644 (file)
--- a/src/HELLO/HELLO.cxx
+++ b/src/HELLO/HELLO.cxx
@@ -32,6 +32,10 @@
 
 #include <string>
 
+#ifdef GetObject
+#undef GetObject
+#endif
+
 namespace {
   static std::string studyName( const std::string& name )
   {