From: rnv Date: Tue, 24 Aug 2021 19:18:51 +0000 (+0300) Subject: #24735 [CEA][Windows] HELLO compilation issue X-Git-Tag: V9_8_0a1^0 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=0ff1aa81c3ed6b9ba40073bf690f0be167c40738;p=samples%2Fhello.git #24735 [CEA][Windows] HELLO compilation issue --- diff --git a/src/HELLO/CMakeLists.txt b/src/HELLO/CMakeLists.txt index 91cb384..f8a6863 100644 --- 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 709f40f..5c7e2c6 100644 --- a/src/HELLO/HELLO.cxx +++ b/src/HELLO/HELLO.cxx @@ -32,6 +32,10 @@ #include +#ifdef GetObject +#undef GetObject +#endif + namespace { static std::string studyName( const std::string& name ) {