simplify vendored lib

Author: wgtmac

cmake_modules/ThirdpartyToolchain.cmake

@@ -18,7 +18,6 @@
 # Accumulate all dependencies to provide suitable static link parameters to the
 # third party libraries.
 set(ICEBERG_SYSTEM_DEPENDENCIES)
-set(ICEBERG_VENDOR_DEPENDENCIES)
 set(ICEBERG_ARROW_INSTALL_INTERFACE_LIBS)
 
 # ----------------------------------------------------------------------
@@ -109,24 +108,17 @@ function(resolve_arrow_dependency)
     endif()
 
     set(ARROW_VENDORED TRUE)
+    set_target_properties(arrow_static PROPERTIES OUTPUT_NAME "iceberg_vendored_arrow")
     install(TARGETS arrow_static
+            EXPORT iceberg_targets
             RUNTIME DESTINATION "${ICEBERG_INSTALL_BINDIR}"
             ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}"
             LIBRARY DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
-
-    get_target_property(ARROW_STATIC_LIB arrow_static OUTPUT_NAME)
-    set(ARROW_STATIC_LIB_NAME
-        "${CMAKE_STATIC_LIBRARY_PREFIX}${ARROW_STATIC_LIB}${CMAKE_STATIC_LIBRARY_SUFFIX}")
-    list(APPEND ICEBERG_VENDOR_DEPENDENCIES
-         "Iceberg::arrow_vendored|${ARROW_STATIC_LIB_NAME}")
   else()
     set(ARROW_VENDORED FALSE)
     list(APPEND ICEBERG_SYSTEM_DEPENDENCIES Arrow)
   endif()
 
-  set(ICEBERG_VENDOR_DEPENDENCIES
-      ${ICEBERG_VENDOR_DEPENDENCIES}
-      PARENT_SCOPE)
   set(ICEBERG_SYSTEM_DEPENDENCIES
       ${ICEBERG_SYSTEM_DEPENDENCIES}
       PARENT_SCOPE)

src/arrow/CMakeLists.txt

@@ -34,8 +34,8 @@ list(APPEND ICEBERG_ARROW_SHARED_BUILD_INTERFACE_LIBS
      "$<IF:$<TARGET_EXISTS:Arrow::arrow_shared>,Arrow::arrow_shared,Arrow::arrow_static>")
 
 if(ARROW_VENDORED)
-  list(APPEND ICEBERG_ARROW_STATIC_INSTALL_INTERFACE_LIBS Iceberg::arrow_vendored)
-  list(APPEND ICEBERG_ARROW_SHARED_INSTALL_INTERFACE_LIBS Iceberg::arrow_vendored)
+  list(APPEND ICEBERG_ARROW_STATIC_INSTALL_INTERFACE_LIBS Iceberg::arrow_static)
+  list(APPEND ICEBERG_ARROW_SHARED_INSTALL_INTERFACE_LIBS Iceberg::arrow_static)
 else()
   list(APPEND
        ICEBERG_ARROW_STATIC_INSTALL_INTERFACE_LIBS

src/config.cmake.in

@@ -32,7 +32,6 @@
 @PACKAGE_INIT@
 
 set(ICEBERG_BUILD_STATIC "@ICEBERG_BUILD_STATIC@")
-set(ICEBERG_VENDOR_DEPENDENCIES "@ICEBERG_VENDOR_DEPENDENCIES@")
 set(ICEBERG_SYSTEM_DEPENDENCIES "@ICEBERG_SYSTEM_DEPENDENCIES@")
 
 include(CMakeFindDependencyMacro)
@@ -70,41 +69,6 @@ macro(iceberg_find_components components)
   endforeach()
 endmacro()
 
-macro(iceberg_find_vendor_dependencies dependencies)
-  get_target_property(_iceberg_static_configurations
-                      Iceberg::iceberg_core_static IMPORTED_CONFIGURATIONS)
-
-  foreach(dependency ${dependencies})
-    string(REPLACE "|" ";" _dependency_pair ${dependency})
-    list(LENGTH _dependency_pair _dependency_pair_length)
-    if(NOT _dependency_pair_length EQUAL 2)
-      message(FATAL_ERROR "Invalid vendor dependency: ${dependency}")
-    endif()
-    list(GET _dependency_pair 0 _target_name)
-    list(GET _dependency_pair 1 _static_lib_name)
-
-    add_library("${_target_name}" STATIC IMPORTED)
-
-    foreach(configuration ${_iceberg_static_configurations})
-      string(TOUPPER "${configuration}" _configuration_upper_case)
-      get_target_property(
-        _iceberg_core_static_location
-        Iceberg::iceberg_core_static LOCATION_${_configuration_upper_case})
-      get_filename_component(
-        iceberg_core_lib_dir
-        "${_iceberg_core_static_location}" DIRECTORY)
-      set_property(
-        TARGET "${_target_name}"
-        APPEND
-        PROPERTY IMPORTED_CONFIGURATIONS ${_configuration_upper_case})
-      set_target_properties(
-        "${_target_name}"
-        PROPERTIES IMPORTED_LOCATION_${_configuration_upper_case}
-                   "${iceberg_core_lib_dir}/${_static_lib_name}")
-    endforeach()
-  endforeach()
-endmacro()
-
 include("${CMAKE_CURRENT_LIST_DIR}/iceberg-targets.cmake")
 
 # Find required components
@@ -113,9 +77,4 @@ iceberg_find_components("${Iceberg_FIND_COMPONENTS}")
 # Find system dependencies
 iceberg_find_dependencies("${ICEBERG_SYSTEM_DEPENDENCIES}")
 
-# Find vendor dependencies
-if(ICEBERG_BUILD_STATIC)
-  iceberg_find_vendor_dependencies("${ICEBERG_VENDOR_DEPENDENCIES}")
-endif()
-
 check_required_components(Iceberg)