use same target

Author: wgtmac

cmake_modules/BuildUtils.cmake

@@ -127,7 +127,7 @@ function(ADD_ICEBERG_LIB LIB_NAME)
                           PRIVATE ${ARG_SHARED_PRIVATE_LINK_LIBS})
 
     install(TARGETS ${LIB_NAME}_shared
-            EXPORT ${LIB_NAME}_targets
+            EXPORT iceberg_targets
             ARCHIVE DESTINATION ${INSTALL_ARCHIVE_DIR}
             LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR}
             RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR}
@@ -176,21 +176,14 @@ function(ADD_ICEBERG_LIB LIB_NAME)
     endif()
 
     install(TARGETS ${LIB_NAME}_static
-            EXPORT ${LIB_NAME}_targets
+            EXPORT iceberg_targets
             ARCHIVE DESTINATION ${INSTALL_ARCHIVE_DIR}
             LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR}
             RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR}
             INCLUDES
             DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
   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)
     set(${ARG_OUTPUTS}

src/CMakeLists.txt

@@ -29,6 +29,11 @@ write_basic_package_version_file(
   "${CMAKE_CURRENT_BINARY_DIR}/iceberg-config-version.cmake"
   COMPATIBILITY SameMajorVersion)
 
+install(EXPORT iceberg_targets
+        DESTINATION "${ICEBERG_INSTALL_CMAKEDIR}/Iceberg"
+        NAMESPACE "Iceberg::"
+        FILE "iceberg-targets.cmake")
+
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/iceberg-config.cmake"
               "${CMAKE_CURRENT_BINARY_DIR}/iceberg-config-version.cmake"
         DESTINATION "${ICEBERG_INSTALL_CMAKEDIR}/Iceberg")

src/config.cmake.in

@@ -58,11 +58,6 @@ macro(iceberg_find_dependencies dependencies)
 endmacro()
 
 macro(iceberg_find_components components)
-  file(GLOB_RECURSE _target_cmake_files "${CMAKE_CURRENT_LIST_DIR}/*-targets.cmake")
-  foreach(_target_cmake_file ${_target_cmake_files})
-    include(${_target_cmake_file})
-  endforeach()
-
   foreach(comp ${components})
     string(TOLOWER "${comp}" _comp_lower_case)
     if(TARGET "Iceberg::iceberg_${_comp_lower_case}_shared" OR
@@ -110,7 +105,9 @@ macro(iceberg_find_vendor_dependencies dependencies)
   endforeach()
 endmacro()
 
-# Find components and include targets
+include("${CMAKE_CURRENT_LIST_DIR}/iceberg-targets.cmake")
+
+# Find required components
 iceberg_find_components("${Iceberg_FIND_COMPONENTS}")
 
 # Find system dependencies