1

Author: HeartLinked

src/iceberg/CMakeLists.txt

@@ -144,41 +144,40 @@ if(ICEBERG_BUILD_BUNDLE)
        "$<IF:$<TARGET_EXISTS:Parquet::parquet_shared>,Parquet::parquet_shared,Parquet::parquet_static>"
        "$<IF:$<TARGET_EXISTS:avro-cpp::avrocpp_shared>,avro-cpp::avrocpp_shared,avro-cpp::avrocpp_static>"
   )
+
   list(APPEND
        ICEBERG_BUNDLE_STATIC_INSTALL_INTERFACE_LIBS
        "$<IF:$<TARGET_EXISTS:Iceberg::iceberg_static>,Iceberg::iceberg_static,Iceberg::iceberg_shared>"
        "$<IF:$<BOOL:${ARROW_VENDORED}>,Iceberg::arrow_static,$<IF:$<TARGET_EXISTS:Arrow::arrow_static>,Arrow::arrow_static,Arrow::arrow_shared>>"
        "$<IF:$<BOOL:${ARROW_VENDORED}>,Iceberg::parquet_static,$<IF:$<TARGET_EXISTS:Parquet::parquet_static>,Parquet::parquet_static,Parquet::parquet_shared>>"
        "$<IF:$<BOOL:${AVRO_VENDORED}>,Iceberg::avrocpp_s,$<IF:$<TARGET_EXISTS:avro-cpp::avrocpp_static>,avro-cpp::avrocpp_static,avro-cpp::avrocpp_shared>>"
   )
-endif()
-list(APPEND
-     ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS
-     "$<IF:$<TARGET_EXISTS:Iceberg::iceberg_shared>,Iceberg::iceberg_shared,Iceberg::iceberg_static>"
-     "$<IF:$<BOOL:${ARROW_VENDORED}>,Iceberg::arrow_static,$<IF:$<TARGET_EXISTS:Arrow::arrow_shared>,Arrow::arrow_shared,Arrow::arrow_static>>"
-     "$<IF:$<BOOL:${ARROW_VENDORED}>,Iceberg::parquet_static,$<IF:$<TARGET_EXISTS:Parquet::parquet_shared>,Parquet::parquet_shared,Parquet::parquet_static>>"
-     "$<IF:$<BOOL:${AVRO_VENDORED}>,Iceberg::avrocpp_s,$<IF:$<TARGET_EXISTS:avro-cpp::avrocpp_shared>,avro-cpp::avrocpp_shared,avro-cpp::avrocpp_static>>"
-)
-endif()
+  list(APPEND
+       ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS
+       "$<IF:$<TARGET_EXISTS:Iceberg::iceberg_shared>,Iceberg::iceberg_shared,Iceberg::iceberg_static>"
+       "$<IF:$<BOOL:${ARROW_VENDORED}>,Iceberg::arrow_static,$<IF:$<TARGET_EXISTS:Arrow::arrow_shared>,Arrow::arrow_shared,Arrow::arrow_static>>"
+       "$<IF:$<BOOL:${ARROW_VENDORED}>,Iceberg::parquet_static,$<IF:$<TARGET_EXISTS:Parquet::parquet_shared>,Parquet::parquet_shared,Parquet::parquet_static>>"
+       "$<IF:$<BOOL:${AVRO_VENDORED}>,Iceberg::avrocpp_s,$<IF:$<TARGET_EXISTS:avro-cpp::avrocpp_shared>,avro-cpp::avrocpp_shared,avro-cpp::avrocpp_static>>"
+  )
 
-add_iceberg_lib(iceberg_bundle
-                SOURCES
-                ${ICEBERG_BUNDLE_SOURCES}
-                SHARED_LINK_LIBS
-                ${ICEBERG_BUNDLE_SHARED_BUILD_INTERFACE_LIBS}
-                STATIC_LINK_LIBS
-                ${ICEBERG_BUNDLE_STATIC_BUILD_INTERFACE_LIBS}
-                STATIC_INSTALL_INTERFACE_LIBS
-                ${ICEBERG_BUNDLE_STATIC_INSTALL_INTERFACE_LIBS}
-                SHARED_INSTALL_INTERFACE_LIBS
-                ${ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS})
+  add_iceberg_lib(iceberg_bundle
+                  SOURCES
+                  ${ICEBERG_BUNDLE_SOURCES}
+                  SHARED_LINK_LIBS
+                  ${ICEBERG_BUNDLE_SHARED_BUILD_INTERFACE_LIBS}
+                  STATIC_LINK_LIBS
+                  ${ICEBERG_BUNDLE_STATIC_BUILD_INTERFACE_LIBS}
+                  STATIC_INSTALL_INTERFACE_LIBS
+                  ${ICEBERG_BUNDLE_STATIC_INSTALL_INTERFACE_LIBS}
+                  SHARED_INSTALL_INTERFACE_LIBS
+                  ${ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS})
 
-add_subdirectory(arrow)
-add_subdirectory(avro)
-add_subdirectory(parquet)
+  add_subdirectory(arrow)
+  add_subdirectory(avro)
+  add_subdirectory(parquet)
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iceberg_bundle_export.h
-        DESTINATION ${ICEBERG_INSTALL_INCLUDEDIR}/iceberg)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iceberg_bundle_export.h
+          DESTINATION ${ICEBERG_INSTALL_INCLUDEDIR}/iceberg)
 endif()
 
 iceberg_install_cmake_package(Iceberg iceberg_targets)