From 0ff1aa81c3ed6b9ba40073bf690f0be167c40738 Mon Sep 17 00:00:00 2001 From: rnv Date: Tue, 24 Aug 2021 22:18:51 +0300 Subject: [PATCH] #24735 [CEA][Windows] HELLO compilation issue --- src/HELLO/CMakeLists.txt | 1 + src/HELLO/HELLO.cxx | 4 ++++ 2 files changed, 5 insertions(+) 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 ) { -- 2.30.2