Skip to content

Commit f5a951b

Browse files
HeartLinkedHeartLinked
committed
test remove
1 parent ed5df0e commit f5a951b

File tree

2 files changed

+47
-51
lines changed

2 files changed

+47
-51
lines changed

‎cmake_modules/IcebergThirdpartyToolchain.cmake‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -505,10 +505,6 @@ function(resolve_cpr_dependency)
505505
set(CPR_USE_SYSTEM_CURL ON)
506506
set(CPR_CURL_NOSIGNAL ON)
507507

508-
# set(CURL_VERSION_STRING
509-
# "8.11.0"
510-
# CACHE STRING "" FORCE)
511-
512508
fetchcontent_declare(cpr
513509
${FC_DECLARE_COMMON_OPTIONS}
514510
URL https://github.com/libcpr/cpr/archive/refs/tags/1.12.0.tar.gz

‎src/iceberg/CMakeLists.txt‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -137,23 +137,23 @@ if(ICEBERG_BUILD_BUNDLE)
137137
"$<IF:$<TARGET_EXISTS:Parquet::parquet_static>,Parquet::parquet_static,Parquet::parquet_shared>"
138138
"$<IF:$<TARGET_EXISTS:avro-cpp::avrocpp_static>,avro-cpp::avrocpp_static,avro-cpp::avrocpp_shared>"
139139
)
140-
if(ICEBERG_BUILD_REST)
141-
list(APPEND ICEBERG_BUNDLE_STATIC_BUILD_INTERFACE_LIBS
142-
"$<IF:$<TARGET_EXISTS:CURL::libcurl>,CURL::libcurl,CURL::libcurl>"
143-
"$<IF:$<TARGET_EXISTS:cpr::cpr>,cpr::cpr,cpr::cpr>")
144-
endif()
140+
# if(ICEBERG_BUILD_REST)
141+
# list(APPEND ICEBERG_BUNDLE_STATIC_BUILD_INTERFACE_LIBS
142+
# "$<IF:$<TARGET_EXISTS:CURL::libcurl>,CURL::libcurl,CURL::libcurl>"
143+
# "$<IF:$<TARGET_EXISTS:cpr::cpr>,cpr::cpr,cpr::cpr>")
144+
# endif()
145145
list(APPEND
146146
ICEBERG_BUNDLE_SHARED_BUILD_INTERFACE_LIBS
147147
"$<IF:$<TARGET_EXISTS:iceberg_shared>,iceberg_shared,iceberg_static>"
148148
"$<IF:$<TARGET_EXISTS:Arrow::arrow_shared>,Arrow::arrow_shared,Arrow::arrow_static>"
149149
"$<IF:$<TARGET_EXISTS:Parquet::parquet_shared>,Parquet::parquet_shared,Parquet::parquet_static>"
150150
"$<IF:$<TARGET_EXISTS:avro-cpp::avrocpp_shared>,avro-cpp::avrocpp_shared,avro-cpp::avrocpp_static>"
151151
)
152-
if(ICEBERG_BUILD_REST)
153-
list(APPEND ICEBERG_BUNDLE_SHARED_BUILD_INTERFACE_LIBS
154-
"$<IF:$<TARGET_EXISTS:CURL::libcurl>,CURL::libcurl,CURL::libcurl>"
155-
"$<IF:$<TARGET_EXISTS:cpr::cpr>,cpr::cpr,cpr::cpr>")
156-
endif()
152+
# if(ICEBERG_BUILD_REST)
153+
# list(APPEND ICEBERG_BUNDLE_SHARED_BUILD_INTERFACE_LIBS
154+
# "$<IF:$<TARGET_EXISTS:CURL::libcurl>,CURL::libcurl,CURL::libcurl>"
155+
# "$<IF:$<TARGET_EXISTS:cpr::cpr>,cpr::cpr,cpr::cpr>")
156+
# endif()
157157

158158
list(APPEND
159159
ICEBERG_BUNDLE_STATIC_INSTALL_INTERFACE_LIBS
@@ -162,46 +162,46 @@ if(ICEBERG_BUILD_BUNDLE)
162162
"$<IF:$<BOOL:${ARROW_VENDORED}>,Iceberg::parquet_static,$<IF:$<TARGET_EXISTS:Parquet::parquet_static>,Parquet::parquet_static,Parquet::parquet_shared>>"
163163
"$<IF:$<BOOL:${AVRO_VENDORED}>,Iceberg::avrocpp_s,$<IF:$<TARGET_EXISTS:avro-cpp::avrocpp_static>,avro-cpp::avrocpp_static,avro-cpp::avrocpp_shared>>"
164164
)
165-
if(ICEBERG_BUILD_REST)
166-
list(APPEND
167-
ICEBERG_BUNDLE_STATIC_INSTALL_INTERFACE_LIBS
168-
"$<IF:$<BOOL:${CURL_VENDORED}>,Iceberg::libcurl_static,$<IF:$<TARGET_EXISTS:CURL::libcurl>,CURL::libcurl,CURL::libcurl>>"
169-
"$<IF:$<BOOL:${CPR_VENDORED}>,Iceberg::cpr,$<IF:$<TARGET_EXISTS:cpr::cpr>,cpr::cpr,cpr::cpr>>"
170-
)
171-
endif()
172-
list(APPEND
173-
ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS
174-
"$<IF:$<TARGET_EXISTS:Iceberg::iceberg_shared>,Iceberg::iceberg_shared,Iceberg::iceberg_static>"
175-
"$<IF:$<BOOL:${ARROW_VENDORED}>,Iceberg::arrow_static,$<IF:$<TARGET_EXISTS:Arrow::arrow_shared>,Arrow::arrow_shared,Arrow::arrow_static>>"
176-
"$<IF:$<BOOL:${ARROW_VENDORED}>,Iceberg::parquet_static,$<IF:$<TARGET_EXISTS:Parquet::parquet_shared>,Parquet::parquet_shared,Parquet::parquet_static>>"
177-
"$<IF:$<BOOL:${AVRO_VENDORED}>,Iceberg::avrocpp_s,$<IF:$<TARGET_EXISTS:avro-cpp::avrocpp_shared>,avro-cpp::avrocpp_shared,avro-cpp::avrocpp_static>>"
178-
)
179-
if(ICEBERG_BUILD_REST)
180-
list(APPEND
181-
ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS
182-
"$<IF:$<BOOL:${CURL_VENDORED}>,Iceberg::libcurl_static,$<IF:$<TARGET_EXISTS:CURL::libcurl>,CURL::libcurl,CURL::libcurl>>"
183-
"$<IF:$<BOOL:${CPR_VENDORED}>,Iceberg::cpr,$<IF:$<TARGET_EXISTS:cpr::cpr>,cpr::cpr,cpr::cpr>>"
184-
)
185-
endif()
165+
# if(ICEBERG_BUILD_REST)
166+
# list(APPEND
167+
# ICEBERG_BUNDLE_STATIC_INSTALL_INTERFACE_LIBS
168+
# "$<IF:$<BOOL:${CURL_VENDORED}>,Iceberg::libcurl_static,$<IF:$<TARGET_EXISTS:CURL::libcurl>,CURL::libcurl,CURL::libcurl>>"
169+
# "$<IF:$<BOOL:${CPR_VENDORED}>,Iceberg::cpr,$<IF:$<TARGET_EXISTS:cpr::cpr>,cpr::cpr,cpr::cpr>>"
170+
# )
171+
endif()
172+
list(APPEND
173+
ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS
174+
"$<IF:$<TARGET_EXISTS:Iceberg::iceberg_shared>,Iceberg::iceberg_shared,Iceberg::iceberg_static>"
175+
"$<IF:$<BOOL:${ARROW_VENDORED}>,Iceberg::arrow_static,$<IF:$<TARGET_EXISTS:Arrow::arrow_shared>,Arrow::arrow_shared,Arrow::arrow_static>>"
176+
"$<IF:$<BOOL:${ARROW_VENDORED}>,Iceberg::parquet_static,$<IF:$<TARGET_EXISTS:Parquet::parquet_shared>,Parquet::parquet_shared,Parquet::parquet_static>>"
177+
"$<IF:$<BOOL:${AVRO_VENDORED}>,Iceberg::avrocpp_s,$<IF:$<TARGET_EXISTS:avro-cpp::avrocpp_shared>,avro-cpp::avrocpp_shared,avro-cpp::avrocpp_static>>"
178+
)
179+
# if(ICEBERG_BUILD_REST)
180+
# list(APPEND
181+
# ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS
182+
# "$<IF:$<BOOL:${CURL_VENDORED}>,Iceberg::libcurl_static,$<IF:$<TARGET_EXISTS:CURL::libcurl>,CURL::libcurl,CURL::libcurl>>"
183+
# "$<IF:$<BOOL:${CPR_VENDORED}>,Iceberg::cpr,$<IF:$<TARGET_EXISTS:cpr::cpr>,cpr::cpr,cpr::cpr>>"
184+
# )
185+
# endif()
186186

187-
add_iceberg_lib(iceberg_bundle
188-
SOURCES
189-
${ICEBERG_BUNDLE_SOURCES}
190-
SHARED_LINK_LIBS
191-
${ICEBERG_BUNDLE_SHARED_BUILD_INTERFACE_LIBS}
192-
STATIC_LINK_LIBS
193-
${ICEBERG_BUNDLE_STATIC_BUILD_INTERFACE_LIBS}
194-
STATIC_INSTALL_INTERFACE_LIBS
195-
${ICEBERG_BUNDLE_STATIC_INSTALL_INTERFACE_LIBS}
196-
SHARED_INSTALL_INTERFACE_LIBS
197-
${ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS})
187+
add_iceberg_lib(iceberg_bundle
188+
SOURCES
189+
${ICEBERG_BUNDLE_SOURCES}
190+
SHARED_LINK_LIBS
191+
${ICEBERG_BUNDLE_SHARED_BUILD_INTERFACE_LIBS}
192+
STATIC_LINK_LIBS
193+
${ICEBERG_BUNDLE_STATIC_BUILD_INTERFACE_LIBS}
194+
STATIC_INSTALL_INTERFACE_LIBS
195+
${ICEBERG_BUNDLE_STATIC_INSTALL_INTERFACE_LIBS}
196+
SHARED_INSTALL_INTERFACE_LIBS
197+
${ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS})
198198

199-
add_subdirectory(arrow)
200-
add_subdirectory(avro)
201-
add_subdirectory(parquet)
199+
add_subdirectory(arrow)
200+
add_subdirectory(avro)
201+
add_subdirectory(parquet)
202202

203-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iceberg_bundle_export.h
204-
DESTINATION ${ICEBERG_INSTALL_INCLUDEDIR}/iceberg)
203+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iceberg_bundle_export.h
204+
DESTINATION ${ICEBERG_INSTALL_INCLUDEDIR}/iceberg)
205205
endif()
206206

207207
iceberg_install_cmake_package(Iceberg iceberg_targets)

0 commit comments

Comments
 (0)