Fixing builds

Author: sonndinh

cmake/opendds_target_sources.cmake

@@ -15,7 +15,7 @@ function(_opendds_get_sources_and_options
     non_idl_prefix
     tao_options
     opendds_options
-    existing_export
+    use_export
     use_versioned_namespace
     suppress_anys
     export_header_dir
@@ -40,7 +40,7 @@ function(_opendds_get_sources_and_options
   set(multi_value_options
     PUBLIC PRIVATE INTERFACE
     TAO_IDL_OPTIONS OPENDDS_IDL_OPTIONS
-    EXISTING_EXPORT
+    USE_EXPORT
     USE_VERSIONED_NAMESPACE
   )
   cmake_parse_arguments(arg
@@ -77,14 +77,14 @@ function(_opendds_get_sources_and_options
   endif()
   set(${suppress_anys} ${arg_SUPPRESS_ANYS} PARENT_SCOPE)
 
-  if(arg_EXISTING_EXPORT)
-    list(LENGTH arg_EXISTING_EXPORT existing_export_len)
-    if(NOT existing_export_len EQUAL 2)
+  if(arg_USE_EXPORT)
+    list(LENGTH arg_USE_EXPORT use_export_len)
+    if(NOT use_export_len EQUAL 2)
       message(FATAL_ERROR
-        "The opendds_target_sources EXISTING_EXPORT option takes a header path and macro name, "
-        "but was passed ${existing_export_len} values")
+        "The opendds_target_sources USE_EXPORT option takes a header path and macro name, "
+        "but was passed ${use_export_len} values")
     endif()
-    set(${existing_export} "${arg_EXISTING_EXPORT}" PARENT_SCOPE)
+    set(${use_export} "${arg_USE_EXPORT}" PARENT_SCOPE)
   else()
     if(NOT DEFINED arg_ALWAYS_GENERATE_LIB_EXPORT_HEADER)
       set(arg_ALWAYS_GENERATE_LIB_EXPORT_HEADER ${OPENDDS_ALWAYS_GENERATE_LIB_EXPORT_HEADER})
@@ -213,7 +213,7 @@ function(opendds_target_sources target)
     non_idl_sources
     tao_options
     opendds_options
-    existing_export
+    use_export
     use_versioned_namespace
     suppress_anys
     export_header_dir
@@ -246,15 +246,14 @@ function(opendds_target_sources target)
   endif()
 
   get_target_property(target_type ${target} TYPE)
-  if(NOT existing_export)
+  if(NOT use_export)
     if((target_type STREQUAL "SHARED_LIBRARY" AND max_scope STREQUAL "PUBLIC")
       OR (target_type MATCHES "LIBRARY" AND always_generate_lib_export_header))
       opendds_export_header(${target} USE_EXPORT_VAR use_export DIR "${export_header_dir}")
     endif()
   else()
-    set(use_export "${existing_export}")
     # Assuming the custom export header is compatible with ones generated by generate_export_file.pl
-    list(GET existing_export 1 existing_macro)
+    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)