move add_interface_library_before inside generate_data_descriptors

Author: max-charlamb

src/coreclr/clrdatadescriptors.cmake

@@ -6,6 +6,18 @@ function(generate_data_descriptors)
   set(multiValueArgs "")
   cmake_parse_arguments(DATA_DESCRIPTORS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGV})
 
+  # Helper Function
+  # Links in an interface to a target with the interface include directories included
+  # before the targets include directories.
+  function(add_interface_library_before target_name interface_name)
+    get_target_property(target_includes ${target_name} INCLUDE_DIRECTORIES)
+    target_link_libraries(${target_name} PRIVATE ${interface_name})
+    set_target_properties(${target_name} PROPERTIES INCLUDE_DIRECTORIES "${target_includes}")
+
+    get_target_property(interface_includes ${interface_name} INTERFACE_INCLUDE_DIRECTORIES)
+    target_include_directories(${target_name} BEFORE PRIVATE ${interface_includes})
+  endfunction(add_interface_library_before)
+
   # INTERMEDIARY_LIBRARY is used as part of the build and not linked into the final product.
   set(INTERMEDIARY_LIBRARY ${DATA_DESCRIPTORS_LIBRARY_NAME}_temp)
   set(LIBRARY ${DATA_DESCRIPTORS_LIBRARY_NAME})
@@ -49,7 +61,7 @@ function(generate_data_descriptors)
     endif()
 
     # inherit definitions, include directories, and dependencies from the INTERFACE target
-    add_interface_library(${INTERMEDIARY_LIBRARY} ${DATA_DESCRIPTORS_INTERFACE_TARGET})
+    add_interface_library_before(${INTERMEDIARY_LIBRARY} ${DATA_DESCRIPTORS_INTERFACE_TARGET})
 
     set(CONTRACT_BASELINE_DIR "${CLR_REPO_ROOT_DIR}/docs/design/datacontracts/data")
     set(CONTRACT_DESCRIPTOR_INPUT "${DATA_DESCRIPTOR_SHARED_SOURCE_DIR}/contract-descriptor.c.in")
@@ -81,17 +93,7 @@ function(generate_data_descriptors)
     )
 
     # inherit definitions, include directories, and dependencies from the INTERFACE target
-    add_interface_library(${LIBRARY} ${DATA_DESCRIPTORS_INTERFACE_TARGET})
+    add_interface_library_before(${LIBRARY} ${DATA_DESCRIPTORS_INTERFACE_TARGET})
   endif()
 endfunction(generate_data_descriptors)
 
-# Links in an interface to a target with the interface include directories included
-# before the targets include directories.
-function(add_interface_library target_name interface_name)
-  get_target_property(target_includes ${target_name} INCLUDE_DIRECTORIES)
-  target_link_libraries(${target_name} PRIVATE ${interface_name})
-  set_target_properties(${target_name} PROPERTIES INCLUDE_DIRECTORIES "${target_includes}")
-
-  get_target_property(interface_includes ${interface_name} INTERFACE_INCLUDE_DIRECTORIES)
-  target_include_directories(${target_name} BEFORE PRIVATE ${interface_includes})
-endfunction(add_interface_library)