wgtmac feedback

Author: WillAyd

CMakeLists.txt

@@ -52,7 +52,7 @@ 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/Iceberg")
+set(ICEBERG_INSTALL_DOCDIR "share/doc/iceberg")
 
 if(WIN32 AND NOT MINGW)
   set(MSVC_TOOLCHAIN TRUE)

cmake_modules/IcebergBuildUtils.cmake

@@ -21,18 +21,18 @@
 include(CMakePackageConfigHelpers)
 
 function(iceberg_install_cmake_package PACKAGE_NAME EXPORT_NAME)
-  set(CONFIG_CMAKE "${PACKAGE_NAME}Config.cmake")
+  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(CONFIG_VERSION_CMAKE "${PACKAGE_NAME}config-version.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")
+  set(TARGETS_CMAKE "${PACKAGE_NAME}-targets.cmake")
   install(EXPORT ${EXPORT_NAME}
           DESTINATION "${ICEBERG_INSTALL_CMAKEDIR}/${PACKAGE_NAME}"
           NAMESPACE "${PACKAGE_NAME}::"
@@ -213,6 +213,7 @@ function(add_iceberg_lib LIB_NAME)
 
     string(TOUPPER ${LIB_NAME} VISIBILITY_NAME)
     target_compile_definitions(${LIB_NAME}_static PUBLIC ${VISIBILITY_NAME}_STATIC)
+
     install(TARGETS ${LIB_NAME}_static
             EXPORT iceberg_targets
             ARCHIVE DESTINATION ${INSTALL_ARCHIVE_DIR}

meson.build

@@ -34,5 +34,5 @@ subdir('src')
 
 install_data(
     ['LICENSE', 'NOTICE'],
-    install_dir: get_option('datadir') / 'doc/Iceberg',
+    install_dir: get_option('datadir') / 'doc/iceberg',
 )

meson.options

@@ -15,6 +15,21 @@
 # specific language governing permissions and limitations
 # under the License.
 
+# Many of the options that CMake provides do not need to be implemented
+# in this configuration, as Meson offers built-in support for them.
+# For instance, instead of ICEBERG_BUILD_STATIC and ICEBERG_BUILD_SHARED
+# you can pass the `--default_library=<option>` to the meson setup command,
+# where <option> is one of "shared", "static", or "both"
+#
+# ICEBERG_ENABLE_ASAN / ICEBERG_ENABLE_UBSAN can be specified with
+# the -Db_sanitize=address,undefined option. Starting in Meson 1.8,
+# you can provide any array of sanitizers to that same argument,
+# including for example the "fuzzing" option
+#
+# ICEBERG_INSTALL_LIBDIR / ICEBERG_INSTALL_BINDIR / ICEBERG_INSTALL_INCLUDEDIR
+# and ICEBERG_INSTALL_DOCDIR correspond to Meson's --libdir / --bindir /
+# --includedir / --datadir arguments, respectively
+
 option(
     'rest',
     type: 'feature',

src/iceberg/CMakeLists.txt

@@ -110,14 +110,6 @@ add_iceberg_lib(iceberg
                 OUTPUTS
                 ICEBERG_LIBRARIES)
 
-foreach(LIB_TARGET ${ICEBERG_LIBRARIES})
-  target_compile_definitions(${LIB_TARGET} PRIVATE ICEBERG_EXPORTING)
-endforeach()
-
-if(ICEBERG_BUILD_STATIC)
-  target_compile_definitions(iceberg_static PUBLIC ICEBERG_STATIC)
-endif()
-
 iceberg_install_all_headers(iceberg)
 
 add_subdirectory(catalog)

src/iceberg/icebergConfig.cmake.in renamed to src/iceberg/iceberg-config.cmake.in

@@ -85,7 +85,7 @@ if(NOT TARGET CURL::libcurl)
   add_library(CURL::libcurl INTERFACE IMPORTED)
 endif()
 
-include("${CMAKE_CURRENT_LIST_DIR}/icebergTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/iceberg-targets.cmake")
 
 if(TARGET iceberg::arrow_static)
   add_library(Arrow::arrow_static ALIAS iceberg::arrow_static)