use single config file with three separate targets to support components

Author: wgtmac

cmake_modules/BuildUtils.cmake

@@ -137,15 +137,15 @@ function(ADD_ICEBERG_LIB LIB_NAME)
     endif()
 
     set_target_properties(${LIB_NAME}_shared
-                          PROPERTIES LINK_FLAGS "${ARG_SHARED_LINK_FLAGS}"
-                                     OUTPUT_NAME ${LIB_NAME})
+                          PROPERTIES LINK_FLAGS "${ARG_SHARED_LINK_FLAGS}" OUTPUT_NAME
+                                                                           ${LIB_NAME})
 
     target_link_libraries(${LIB_NAME}_shared
                           PUBLIC "$<BUILD_INTERFACE:${ARG_SHARED_LINK_LIBS}>"
                                  "$<INSTALL_INTERFACE:${ARG_SHARED_INSTALL_INTERFACE_LIBS}>"
                           PRIVATE ${ARG_SHARED_PRIVATE_LINK_LIBS})
 
-    install(TARGETS ${LIB_NAME}_shared ${INSTALL_IS_OPTIONAL}
+    install(TARGETS ${LIB_NAME}_shared
             EXPORT ${LIB_NAME}_targets
             ARCHIVE DESTINATION ${INSTALL_ARCHIVE_DIR}
             LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR}
@@ -187,20 +187,20 @@ function(ADD_ICEBERG_LIB LIB_NAME)
       set(LIB_NAME_STATIC ${LIB_NAME})
     endif()
 
-    set_target_properties(${LIB_NAME}_static
-                          PROPERTIES OUTPUT_NAME ${LIB_NAME_STATIC})
+    set_target_properties(${LIB_NAME}_static PROPERTIES OUTPUT_NAME ${LIB_NAME_STATIC})
 
     if(ARG_STATIC_INSTALL_INTERFACE_LIBS)
       target_link_libraries(${LIB_NAME}_static
-                            INTERFACE "$<INSTALL_INTERFACE:${ARG_STATIC_INSTALL_INTERFACE_LIBS}>")
+                            INTERFACE "$<INSTALL_INTERFACE:${ARG_STATIC_INSTALL_INTERFACE_LIBS}>"
+      )
     endif()
 
     if(ARG_STATIC_LINK_LIBS)
       target_link_libraries(${LIB_NAME}_static
                             PUBLIC "$<BUILD_INTERFACE:${ARG_STATIC_LINK_LIBS}>")
     endif()
 
-    install(TARGETS ${LIB_NAME}_static ${INSTALL_IS_OPTIONAL}
+    install(TARGETS ${LIB_NAME}_static
             EXPORT ${LIB_NAME}_targets
             ARCHIVE DESTINATION ${INSTALL_ARCHIVE_DIR}
             LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR}
@@ -210,7 +210,12 @@ function(ADD_ICEBERG_LIB LIB_NAME)
   endif()
 
   if(ARG_CMAKE_PACKAGE_NAME)
-    iceberg_install_cmake_package(${ARG_CMAKE_PACKAGE_NAME} ${LIB_NAME}_targets)
+    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()
 
   # Modify variable in calling scope

example/CMakeLists.txt

@@ -22,13 +22,12 @@ project(example)
 
 set(CMAKE_CXX_STANDARD 20)
 
-find_package(IcebergCore CONFIG REQUIRED)
-find_package(IcebergPuffin CONFIG REQUIRED)
-find_package(IcebergArrow CONFIG REQUIRED)
+find_package(Iceberg CONFIG REQUIRED COMPONENTS core puffin arrow)
+message(STATUS "Iceberg_FOUND: ${Iceberg_FOUND}")
+message(STATUS "Iceberg_VERSION: ${Iceberg_VERSION}")
 
 add_executable(demo_example demo_example.cc)
 
 target_link_libraries(demo_example
-                      PRIVATE IcebergCore::iceberg_core_static
-                              IcebergPuffin::iceberg_puffin_static
-                              IcebergArrow::iceberg_arrow_static)
+                      PRIVATE Iceberg::iceberg_core_static Iceberg::iceberg_puffin_static
+                              Iceberg::iceberg_arrow_static)

src/CMakeLists.txt

@@ -18,3 +18,14 @@
 add_subdirectory(arrow)
 add_subdirectory(core)
 add_subdirectory(puffin)
+
+configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/config.cmake.in"
+                              "${CMAKE_CURRENT_BINARY_DIR}/iceberg-config.cmake"
+                              INSTALL_DESTINATION "${ICEBERG_INSTALL_CMAKEDIR}/Iceberg"
+                              NO_CHECK_REQUIRED_COMPONENTS_MACRO)
+write_basic_package_version_file(
+  "${CMAKE_CURRENT_BINARY_DIR}/iceberg-config-version.cmake"
+  COMPATIBILITY SameMajorVersion)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/iceberg-config.cmake"
+              "${CMAKE_CURRENT_BINARY_DIR}/iceberg-config-version.cmake"
+        DESTINATION "${ICEBERG_INSTALL_CMAKEDIR}/Iceberg")

src/arrow/CMakeLists.txt

@@ -46,7 +46,7 @@ endif()
 add_iceberg_lib(
   iceberg_arrow
   CMAKE_PACKAGE_NAME
-  IcebergArrow
+  Iceberg
   SOURCES
   ${ICEBERG_ARROW_SOURCES}
   PRIVATE_INCLUDES

src/arrow/IcebergArrowConfig.cmake.in renamed to src/config.cmake.in

@@ -17,32 +17,63 @@
 #
 # This config sets the following variables in your project::
 #
-#   IcebergArrow_FOUND - true if IcebergArrow found on the system
-#   ICEBERG_ARROW_VERSION - version of the found IcebergArrow
+#   Iceberg_FOUND - true if Iceberg found on the system
+#   Iceberg_VERSION - version of the found Iceberg
 #
 # This config sets the following targets in your project::
 #
-#   IcebergArrow::iceberg_arrow_shared - for linked as shared library if shared library is built
-#   IcebergArrow::iceberg_arrow_static - for linked as static library if static library is built
+#   Iceberg::iceberg_core_shared - for linked as shared library if shared library is built
+#   Iceberg::iceberg_core_static - for linked as static library if static library is built
+#   Iceberg::iceberg_puffin_shared - for linked as shared library if shared library is built
+#   Iceberg::iceberg_puffin_static - for linked as static library if static library is built
+#   Iceberg::iceberg_arrow_shared - for linked as shared library if shared library is built
+#   Iceberg::iceberg_arrow_static - for linked as static library if static library is built
 
 @PACKAGE_INIT@
 
+include(CMakeFindDependencyMacro)
+
+macro(iceberg_find_dependencies dependencies)
+  if(DEFINED CMAKE_MODULE_PATH)
+    set(ICEBERG_CMAKE_MODULE_PATH_OLD ${CMAKE_MODULE_PATH})
+  else()
+    unset(ICEBERG_CMAKE_MODULE_PATH_OLD)
+  endif()
+  set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
+
+  foreach(dependency ${dependencies})
+    find_dependency(${dependency})
+  endforeach()
+
+  if(DEFINED ICEBERG_CMAKE_MODULE_PATH_OLD)
+    set(CMAKE_MODULE_PATH ${ICEBERG_CMAKE_MODULE_PATH_OLD})
+    unset(ICEBERG_CMAKE_MODULE_PATH_OLD)
+  else()
+    unset(CMAKE_MODULE_PATH)
+  endif()
+endmacro()
+
 set(ICEBERG_BUILD_STATIC "@ICEBERG_BUILD_STATIC@")
 set(ICEBERG_ARROW_VENDOR_DEPENDENCIES "@ICEBERG_ARROW_VENDOR_DEPENDENCIES@")
 set(ICEBERG_ARROW_SYSTEM_DEPENDENCIES "@ICEBERG_ARROW_SYSTEM_DEPENDENCIES@")
 
-include(CMakeFindDependencyMacro)
-find_dependency(IcebergCore)
+set(_iceberg_supported_components core puffin arrow)
+
+foreach(_comp ${Iceberg_FIND_COMPONENTS})
+  if (NOT _comp IN_LIST _iceberg_supported_components)
+    set(Iceberg_FOUND False)
+    set(Iceberg_NOT_FOUND_MESSAGE "Unsupported component: ${_comp}")
+  endif()
+  include("${CMAKE_CURRENT_LIST_DIR}/iceberg-${_comp}-targets.cmake" REQUIRED)
+endforeach()
 
 if(ICEBERG_BUILD_STATIC)
   iceberg_find_dependencies("${ICEBERG_ARROW_SYSTEM_DEPENDENCIES}")
 endif()
 
-include("${CMAKE_CURRENT_LIST_DIR}/IcebergArrowTargets.cmake")
-
 if(ICEBERG_BUILD_STATIC)
   get_target_property(
-    iceberg_arrow_static_configurations IcebergArrow::iceberg_arrow_static
+    iceberg_arrow_static_configurations Iceberg::iceberg_arrow_static
     IMPORTED_CONFIGURATIONS)
 
   foreach(dependency ${ICEBERG_ARROW_VENDOR_DEPENDENCIES})
@@ -59,7 +90,7 @@ if(ICEBERG_BUILD_STATIC)
     foreach(CONFIGURATION ${iceberg_arrow_static_configurations})
       string(TOUPPER "${CONFIGURATION}" CONFIGURATION)
       get_target_property(
-        iceberg_arrow_static_location IcebergArrow::iceberg_arrow_static
+        iceberg_arrow_static_location Iceberg::iceberg_arrow_static
         LOCATION_${CONFIGURATION})
       get_filename_component(iceberg_arrow_lib_dir
                              "${iceberg_arrow_static_location}" DIRECTORY)
@@ -73,7 +104,4 @@ if(ICEBERG_BUILD_STATIC)
                    "${iceberg_arrow_lib_dir}/${static_lib_name}")
     endforeach()
   endforeach()
-
 endif()
-
-check_required_components(IcebergArrow)

src/core/CMakeLists.txt

@@ -20,7 +20,7 @@ set(ICEBERG_CORE_INCLUDES "${ICEBERG_API_DIR}")
 
 add_iceberg_lib(iceberg_core
                 CMAKE_PACKAGE_NAME
-                IcebergCore
+                Iceberg
                 SOURCES
                 ${ICEBERG_CORE_SOURCES}
                 PRIVATE_INCLUDES

src/core/IcebergCoreConfig.cmake.in

@@ -20,7 +20,7 @@ set(ICEBERG_PUFFIN_INCLUDES "${ICEBERG_API_DIR}")
 
 add_iceberg_lib(iceberg_puffin
                 CMAKE_PACKAGE_NAME
-                IcebergPuffin
+                Iceberg
                 SOURCES
                 ${ICEBERG_PUFFIN_SOURCES}
                 PRIVATE_INCLUDES