add components

Author: wgtmac

CMakeLists.txt

@@ -48,20 +48,16 @@ set(ICEBERG_DEPENDENCY_SOURCE "AUTO" CACHE STRING "Method to use for acquiring b
 set_property(CACHE ICEBERG_DEPENDENCY_SOURCE PROPERTY STRINGS "AUTO" "VENDOR" "SYSTEM")
 option(ICEBERG_ARROW "Build Arrow" ON)
 
-include(CMakePackageConfigHelpers)
-include(CMakeParseArguments)
-include(BuildUtils)
-include(ExternalProject)
-include(FindPackageHandleStandardArgs)
 include(GNUInstallDirs)
-
 set(ICEBERG_API_DIR "${CMAKE_SOURCE_DIR}/api")
 set(ICEBERG_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
 set(ICEBERG_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}")
 set(ICEBERG_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
 set(ICEBERG_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake")
 set(ICEBERG_INSTALL_DOCDIR "share/doc/${PROJECT_NAME}")
 
+include(CMakeParseArguments)
+include(BuildUtils)
 include(ThirdpartyToolchain)
 
 add_subdirectory(api)

cmake_modules/BuildUtils.cmake

@@ -18,30 +18,11 @@
 # Borrowed the file from Apache Arrow:
 # https://github.com/apache/arrow/blob/main/cpp/cmake_modules/BuildUtils.cmake
 
-function(iceberg_install_cmake_package PACKAGE_NAME EXPORT_NAME)
-  set(CONFIG_CMAKE "${PACKAGE_NAME}Config.cmake")
-  set(BUILT_CONFIG_CMAKE "${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_CMAKE}")
-  configure_package_config_file("${CONFIG_CMAKE}.in" "${BUILT_CONFIG_CMAKE}"
-                                INSTALL_DESTINATION "${ICEBERG_INSTALL_CMAKEDIR}/${PACKAGE_NAME}")
-  set(CONFIG_VERSION_CMAKE "${PACKAGE_NAME}ConfigVersion.cmake")
-  set(BUILT_CONFIG_VERSION_CMAKE "${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_VERSION_CMAKE}")
-  write_basic_package_version_file("${BUILT_CONFIG_VERSION_CMAKE}"
-                                   COMPATIBILITY SameMajorVersion)
-  install(FILES "${BUILT_CONFIG_CMAKE}" "${BUILT_CONFIG_VERSION_CMAKE}"
-          DESTINATION "${ICEBERG_INSTALL_CMAKEDIR}/${PACKAGE_NAME}")
-  set(TARGETS_CMAKE "${PACKAGE_NAME}Targets.cmake")
-  install(EXPORT ${EXPORT_NAME}
-          DESTINATION "${ICEBERG_INSTALL_CMAKEDIR}/${PACKAGE_NAME}"
-          NAMESPACE "${PACKAGE_NAME}::"
-          FILE "${TARGETS_CMAKE}")
-endfunction()
-
 function(ADD_ICEBERG_LIB LIB_NAME)
   set(options)
   set(one_value_args
       BUILD_SHARED
       BUILD_STATIC
-      CMAKE_PACKAGE_NAME
       INSTALL_ARCHIVE_DIR
       INSTALL_LIBRARY_DIR
       INSTALL_RUNTIME_DIR
@@ -209,14 +190,12 @@ function(ADD_ICEBERG_LIB LIB_NAME)
             DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
   endif()
 
-  if(ARG_CMAKE_PACKAGE_NAME)
-    string(REPLACE "_" "-" LIB_NAME_DASHED ${LIB_NAME})
-    set(TARGETS_CMAKE "${LIB_NAME_DASHED}-targets.cmake")
-    install(EXPORT ${LIB_NAME}_targets
-            DESTINATION "${ICEBERG_INSTALL_CMAKEDIR}/${ARG_CMAKE_PACKAGE_NAME}"
-            NAMESPACE Iceberg::
-            FILE "${TARGETS_CMAKE}")
-  endif()
+  string(TOLOWER ${LIB_NAME} LIB_NAME_LOWER_CASE)
+  string(REPLACE "_" "-" LIB_NAME_DASH_SEPARATED_LOWER_CASE ${LIB_NAME_LOWER_CASE})
+  install(EXPORT ${LIB_NAME}_targets
+          DESTINATION "${ICEBERG_INSTALL_CMAKEDIR}/Iceberg"
+          NAMESPACE "Iceberg::"
+          FILE "${LIB_NAME_DASH_SEPARATED_LOWER_CASE}-targets.cmake")
 
   # Modify variable in calling scope
   if(ARG_OUTPUTS)