2121include (CMakePackageConfigHelpers)
2222
2323function (iceberg_install_cmake_package PACKAGE_NAME EXPORT_NAME)
24- set (CONFIG_CMAKE "${PACKAGE_NAME} Config .cmake" )
24+ set (CONFIG_CMAKE "${PACKAGE_NAME} -config .cmake" )
2525 set (BUILT_CONFIG_CMAKE "${CMAKE_CURRENT_BINARY_DIR} /${CONFIG_CMAKE} " )
2626 configure_package_config_file("${CONFIG_CMAKE} .in" "${BUILT_CONFIG_CMAKE} "
2727 INSTALL_DESTINATION "${ICEBERG_INSTALL_CMAKEDIR} /${PACKAGE_NAME} "
2828 )
29- set (CONFIG_VERSION_CMAKE "${PACKAGE_NAME} ConfigVersion .cmake" )
29+ set (CONFIG_VERSION_CMAKE "${PACKAGE_NAME} config-version .cmake" )
3030 set (BUILT_CONFIG_VERSION_CMAKE "${CMAKE_CURRENT_BINARY_DIR} /${CONFIG_VERSION_CMAKE} " )
3131 write_basic_package_version_file("${BUILT_CONFIG_VERSION_CMAKE} "
3232 COMPATIBILITY SameMajorVersion)
3333 install (FILES "${BUILT_CONFIG_CMAKE} " "${BUILT_CONFIG_VERSION_CMAKE} "
3434 DESTINATION "${ICEBERG_INSTALL_CMAKEDIR} /${PACKAGE_NAME} " )
35- set (TARGETS_CMAKE "${PACKAGE_NAME} Targets .cmake" )
35+ set (TARGETS_CMAKE "${PACKAGE_NAME} -targets .cmake" )
3636 install (EXPORT ${EXPORT_NAME}
3737 DESTINATION "${ICEBERG_INSTALL_CMAKEDIR} /${PACKAGE_NAME} "
3838 NAMESPACE "${PACKAGE_NAME} ::"
@@ -150,6 +150,9 @@ function(add_iceberg_lib LIB_NAME)
150150 target_link_libraries (${LIB_NAME} _shared
151151 PUBLIC "$<BUILD_INTERFACE:iceberg_sanitizer_flags>" )
152152
153+ string (TOUPPER ${LIB_NAME} VISIBILITY_NAME)
154+ target_compile_definitions (${LIB_NAME} _shared PRIVATE ${VISIBILITY_NAME} _EXPORTING)
155+
153156 install (TARGETS ${LIB_NAME} _shared
154157 EXPORT iceberg_targets
155158 ARCHIVE DESTINATION ${INSTALL_ARCHIVE_DIR}
@@ -208,6 +211,9 @@ function(add_iceberg_lib LIB_NAME)
208211 target_link_libraries (${LIB_NAME} _static
209212 PUBLIC "$<BUILD_INTERFACE:iceberg_sanitizer_flags>" )
210213
214+ string (TOUPPER ${LIB_NAME} VISIBILITY_NAME)
215+ target_compile_definitions (${LIB_NAME} _static PUBLIC ${VISIBILITY_NAME} _STATIC)
216+
211217 install (TARGETS ${LIB_NAME} _static
212218 EXPORT iceberg_targets
213219 ARCHIVE DESTINATION ${INSTALL_ARCHIVE_DIR}
@@ -217,18 +223,6 @@ function(add_iceberg_lib LIB_NAME)
217223 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} )
218224 endif ()
219225
220- # generate export header file
221- if (BUILD_SHARED)
222- generate_export_header(${LIB_NAME} _shared BASE_NAME ${LIB_NAME} )
223- if (BUILD_STATIC)
224- string (TOUPPER ${LIB_NAME} LIB_NAME_UPPER)
225- target_compile_definitions (${LIB_NAME} _static
226- PUBLIC ${LIB_NAME_UPPER} _STATIC_DEFINE)
227- endif ()
228- elseif (BUILD_STATIC)
229- generate_export_header(${LIB_NAME} _static BASE_NAME ${LIB_NAME} )
230- endif ()
231-
232226 # Modify variable in calling scope
233227 if (ARG_OUTPUTS)
234228 set (${ARG_OUTPUTS}
0 commit comments