Commit fe3274af authored by Thomas Braun's avatar Thomas Braun
Browse files

src/include/tango.h.in: Move USE_stub_in_nt_dll handling into idl_wrapper.h 

We now do have a dedicated header file idl_wrapper.h to do the
required special handling for including tango/idl/tango.h. So let's move
the USE_stub_in_nt_dll [1] there as well.

As we already include idl_wrapper.h from tango.h.in we can also remove the
direct inclusion.

[1]: https://omniorb.sourceforge.io/omni40/omniORB/omniORB012.html
parent 7a6fd9ed

src/include/tango/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ else() 
    set(TANGO_WINDOWS_HEADERS_FULL "")

endif()



decorate_with_include("${TANGO_IDL_HEADER}" "tango/idl" TANGO_IDL_HEADER_FULL)

decorate_with_include("${TANGO_COMMON_HEADERS}" "tango/common" TANGO_COMMON_HEADERS_FULL)

decorate_with_include("${TANGO_TELEMETRY_HEADERS}" "tango/common/telemetry" TANGO_TELEMETRY_HEADERS_FULL)

decorate_with_include("${TANGO_CLIENT_HEADERS}" "tango/client" TANGO_CLIENT_HEADERS_FULL)

src/include/tango/common/idl_wrapper.h

+6 −0
Original line number Diff line number Diff line
@@ -7,6 +7,12 @@ 
#ifndef TANGO_COMMON_IDL_WRAPPER_H

#define TANGO_COMMON_IDL_WRAPPER_H



#include <tango/server/tango_config.h>



#if defined(_TG_WINDOWS_) && defined(TANGO_HAS_DLL) && !defined(_TANGO_LIB)

  #define USE_stub_in_nt_dll

#endif



// FIXME remove once https://gitlab.com/tango-controls/cppTango/-/issues/786 is fixed

#ifdef __clang__

  #pragma clang diagnostic push

src/include/tango/idl/CMakeLists.txt

+0 −2
Original line number Diff line number Diff line
@@ -49,5 +49,3 @@ if(NOT WIN32) 
endif()



install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tango.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tango/idl)
 


set(TANGO_IDL_HEADER "tango.h" PARENT_SCOPE)

src/include/tango/tango.h.in

+0 −21
Original line number Diff line number Diff line
@@ -12,27 +12,6 @@ 
//

#include <tango/server/tango_config.h>



//

// Include IDL generated files which includes CORBA include files

//



#if defined(_TG_WINDOWS_) && defined(TANGO_HAS_DLL) && !defined(_TANGO_LIB)

  #define USE_stub_in_nt_dll

#endif



// FIXME remove once https://gitlab.com/tango-controls/cppTango/-/issues/786 is fixed

#if defined(__clang__)

  #pragma clang diagnostic push

  #pragma clang diagnostic ignored "-Wdeprecated"

#endif



// CORBA declarations from the IDL file (generated)

@TANGO_IDL_HEADER_FULL@



#if defined(__clang__)

  #pragma clang diagnostic pop

#endif



// common headers

@TANGO_COMMON_HEADERS_FULL@