kou commented on code in PR #6: URL: https://github.com/apache/iceberg-cpp/pull/6#discussion_r1904829176
########## cmake_modules/BuildUtils.cmake: ########## @@ -201,17 +202,26 @@ function(ADD_ICEBERG_LIB LIB_NAME) PUBLIC "$<BUILD_INTERFACE:${ARG_STATIC_LINK_LIBS}>") endif() - install(TARGETS ${LIB_NAME}_static ${INSTALL_IS_OPTIONAL} - EXPORT ${LIB_NAME}_targets + install(TARGETS ${LIB_NAME}_static + EXPORT iceberg_targets ARCHIVE DESTINATION ${INSTALL_ARCHIVE_DIR} LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR} RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR} INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) endif() - if(ARG_CMAKE_PACKAGE_NAME) - iceberg_install_cmake_package(${ARG_CMAKE_PACKAGE_NAME} ${LIB_NAME}_targets) + # generate export header file + string(TOUPPER ${LIB_NAME} LIB_NAME_UPPER) + if(BUILD_SHARED) + generate_export_header(${LIB_NAME}_shared BASE_NAME ${LIB_NAME_UPPER}) + target_compile_definitions(${LIB_NAME}_shared PUBLIC ${LIB_NAME}_shared_EXPORTS) Review Comment: I think that we can merge this now. ########## cmake_modules/BuildUtils.cmake: ########## @@ -201,17 +202,26 @@ function(ADD_ICEBERG_LIB LIB_NAME) PUBLIC "$<BUILD_INTERFACE:${ARG_STATIC_LINK_LIBS}>") endif() - install(TARGETS ${LIB_NAME}_static ${INSTALL_IS_OPTIONAL} - EXPORT ${LIB_NAME}_targets + install(TARGETS ${LIB_NAME}_static + EXPORT iceberg_targets ARCHIVE DESTINATION ${INSTALL_ARCHIVE_DIR} LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR} RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR} INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) endif() - if(ARG_CMAKE_PACKAGE_NAME) - iceberg_install_cmake_package(${ARG_CMAKE_PACKAGE_NAME} ${LIB_NAME}_targets) + # generate export header file + string(TOUPPER ${LIB_NAME} LIB_NAME_UPPER) + if(BUILD_SHARED) + generate_export_header(${LIB_NAME}_shared BASE_NAME ${LIB_NAME_UPPER}) + target_compile_definitions(${LIB_NAME}_shared PUBLIC ${LIB_NAME}_shared_EXPORTS) Review Comment: Thanks for explaining the context. How about discussing it as a follow-up task if it's needed? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org