Skip to content

Commit d917c70

Browse files
committed
CMake Configuration updates
1 parent f2f9d8d commit d917c70

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

cmake_modules/IcebergBuildUtils.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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,8 @@ 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)
211216
install(TARGETS ${LIB_NAME}_static
212217
EXPORT iceberg_targets
213218
ARCHIVE DESTINATION ${INSTALL_ARCHIVE_DIR}

src/iceberg/CMakeLists.txt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -182,17 +182,9 @@ if(ICEBERG_BUILD_BUNDLE)
182182
OUTPUTS
183183
ICEBERG_BUNDLE_LIBRARIES)
184184

185-
foreach(LIB_TARGET ${ICEBERG_BUNDLE_LIBRARIES})
186-
target_compile_definitions(${LIB_TARGET} PRIVATE ICEBERG_BUNDLE_EXPORTING)
187-
endforeach()
188-
189-
if(ICEBERG_BUILD_STATIC)
190-
target_compile_definitions(iceberg_bundle_static PUBLIC ICEBERG_BUNDLE_STATIC)
191-
endif()
192-
193185
add_subdirectory(arrow)
194186
add_subdirectory(avro)
195187
add_subdirectory(parquet)
196188
endif()
197189

198-
iceberg_install_cmake_package(Iceberg iceberg_targets)
190+
iceberg_install_cmake_package(iceberg iceberg_targets)
File renamed without changes.

0 commit comments

Comments
 (0)