Call opendds_export_header instead of manually set BUILD_DLL and HAS_DLL macros

Author: sonndinh

cmake/opendds_target_sources.cmake

@@ -253,16 +253,11 @@ function(opendds_target_sources target)
     endif()
   else()
     # Assuming the custom export header is compatible with ones generated by generate_export_file.pl
+    list(GET use_export 0 existing_header)
     list(GET use_export 1 existing_macro)
     string(FIND ${existing_macro} "_Export" index)
     string(SUBSTRING ${existing_macro} 0 ${index} macro_prefix)
-    string(TOUPPER ${macro_prefix} macro_prefix)
-    if(target_type STREQUAL "SHARED_LIBRARY")
-      target_compile_definitions(${target} PRIVATE "${macro_prefix}_BUILD_DLL")
-      target_compile_definitions(${target} PUBLIC "${macro_prefix}_HAS_DLL=1")
-    elseif(target_type STREQUAL "STATIC_LIBRARY")
-      target_compile_definitions(${target} PUBLIC "${macro_prefix}_HAS_DLL=0")
-    endif()
+    opendds_export_header(${target} EXISTING INCLUDE ${existing_header} MACRO_PREFIX ${macro_prefix})
   endif()
 
   if(use_versioned_namespace)

docs/news.d/cmake-use-export.rst

@@ -0,0 +1,8 @@
+.. news-prs: 4964
+
+.. news-start-section: Platform Support and Dependencies
+.. news-start-section: CMake
+- Fixed support for existing export header and macro in :cmake:func:`opendds_target_sources` with `USE_EXPORT`.
+
+.. news-end-section
+.. news-end-section