wgtmac commented on code in PR #6:
URL: https://github.com/apache/iceberg-cpp/pull/6#discussion_r1900615479
##########
cmake_modules/BuildUtils.cmake:
##########
@@ -201,23 +202,29 @@ 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)
- endif()
-
# Modify variable in calling scope
if(ARG_OUTPUTS)
set(${ARG_OUTPUTS}
${${ARG_OUTPUTS}}
PARENT_SCOPE)
endif()
endfunction()
+
+function(iceberg_set_export_definitions STATIC_TARGET LIB_TARGETS)
+ if(ICEBERG_BUILD_STATIC AND WIN32)
+ target_compile_definitions(${STATIC_TARGET} PUBLIC ICEBERG_STATIC)
+ endif()
+
+ foreach(LIB_TARGET ${LIB_TARGETS})
+ target_compile_definitions(${LIB_TARGET} PRIVATE ICEBERG_EXPORTING)
+ endforeach()
+endfunction()
Review Comment:
After applying generate_export_header, now the installed directory looks
like:
```
/tmp/iceberg/
├── lib/
│ ├── libiceberg_vendored_arrow.a
│ ├── libiceberg.dylib
│ ├── libiceberg.a
│ ├── libiceberg_arrow.dylib
│ ├── libiceberg_arrow.a
│ ├── libiceberg_puffin.dylib
│ ├── libiceberg_puffin.a
│ └── cmake/
│ └── Iceberg/
│ ├── IcebergConfig.cmake
│ ├── IcebergConfigVersion.cmake
│ ├── IcebergTargets.cmake
│ └── IcebergTargets-debug.cmake
├── include/
│ └── iceberg/
│ ├── demo_table.h
│ ├── puffin.h
│ ├── table.h
│ ├── iceberg_export.h
│ └── arrow/
│ ├── demo_arrow.h
│ └── iceberg_arrow_export.h
│ └── puffin/
│ ├── demo_puffin.h
│ └── iceberg_puffin_export.h
└── share/
└── doc/
└── Iceberg/
├── LICENSE
└── NOTICE
```
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
