Skip to content

Commit 1224239

Browse files
HeartLinkedHeartLinked
committed
rename
1 parent d837246 commit 1224239

File tree

6 files changed

+38
-61
lines changed

6 files changed

+38
-61
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ option(ICEBERG_BUILD_STATIC "Build static library" ON)
3838
option(ICEBERG_BUILD_SHARED "Build shared library" OFF)
3939
option(ICEBERG_BUILD_TESTS "Build tests" ON)
4040
option(ICEBERG_BUILD_BUNDLE "Build the battery included library" ON)
41-
option(ICEBERG_BUILD_REST_CATALOG "Build REST catalog library" ON)
41+
option(ICEBERG_BUILD_REST "Build rest catalog client" ON)
4242
option(ICEBERG_ENABLE_ASAN "Enable Address Sanitizer" OFF)
4343
option(ICEBERG_ENABLE_UBSAN "Enable Undefined Behavior Sanitizer" OFF)
4444

‎cmake_modules/IcebergThirdpartyToolchain.cmake‎

Lines changed: 14 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -437,27 +437,13 @@ function(resolve_curl_dependency)
437437
prepare_fetchcontent()
438438

439439
set(BUILD_CURL_EXE OFF)
440-
set(BUILD_TESTING
441-
OFF
442-
CACHE BOOL "" FORCE)
443-
set(CURL_ENABLE_EXPORT_TARGET
444-
OFF
445-
CACHE BOOL "" FORCE)
446-
set(BUILD_SHARED_LIBS
447-
OFF
448-
CACHE BOOL "" FORCE)
449-
set(CURL_STATICLIB
450-
ON
451-
CACHE BOOL "" FORCE)
452-
set(HTTP_ONLY
453-
ON
454-
CACHE BOOL "" FORCE)
455-
set(CURL_CA_BUNDLE
456-
"auto"
457-
CACHE STRING "" FORCE)
458-
set(USE_LIBIDN2
459-
OFF
460-
CACHE BOOL "" FORCE)
440+
set(BUILD_SHARED_LIBS OFF)
441+
set(BUILD_TESTING OFF)
442+
set(CURL_CA_BUNDLE "auto")
443+
set(CURL_ENABLE_EXPORT_TARGET OFF)
444+
set(CURL_STATICLIB ON)
445+
set(HTTP_ONLY ON)
446+
set(USE_LIBIDN2 OFF)
461447

462448
fetchcontent_declare(CURL
463449
${FC_DECLARE_COMMON_OPTIONS}
@@ -488,7 +474,7 @@ function(resolve_curl_dependency)
488474
LIBRARY DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
489475
message(STATUS "Use vendored CURL")
490476

491-
# curl depends on the system's OpenSSL
477+
# curl depends on the system installed OpenSSL
492478
list(APPEND ICEBERG_SYSTEM_DEPENDENCIES OpenSSL)
493479
else()
494480
set(CURL_VENDORED FALSE)
@@ -510,21 +496,11 @@ endfunction()
510496
function(resolve_cpr_dependency)
511497
prepare_fetchcontent()
512498

513-
set(CPR_BUILD_TESTS
514-
OFF
515-
CACHE BOOL "" FORCE)
516-
set(CPR_BUILD_TESTS_SSL
517-
OFF
518-
CACHE BOOL "" FORCE)
519-
set(CPR_ENABLE_SSL
520-
ON
521-
CACHE BOOL "" FORCE)
522-
set(CPR_USE_SYSTEM_CURL
523-
ON
524-
CACHE BOOL "" FORCE)
525-
set(CPR_CURL_NOSIGNAL
526-
ON
527-
CACHE BOOL "" FORCE)
499+
set(CPR_BUILD_TESTS OFF)
500+
set(CPR_BUILD_TESTS_SSL OFF)
501+
set(CPR_ENABLE_SSL ON)
502+
set(CPR_USE_SYSTEM_CURL ON)
503+
set(CPR_CURL_NOSIGNAL ON)
528504

529505
set(CURL_VERSION_STRING
530506
"8.11.0"
@@ -599,7 +575,7 @@ if(ICEBERG_BUILD_BUNDLE)
599575
resolve_zstd_dependency()
600576
endif()
601577

602-
if(ICEBERG_BUILD_REST_CATALOG)
578+
if(ICEBERG_BUILD_REST)
603579
resolve_curl_dependency()
604580
resolve_cpr_dependency()
605581
endif()

‎example/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@ find_package(Iceberg CONFIG REQUIRED)
2626

2727
add_executable(demo_example demo_example.cc)
2828

29-
target_link_libraries(demo_example PRIVATE Iceberg::iceberg_bundle_static)
29+
target_link_libraries(demo_example PRIVATE Iceberg::iceberg_bundle_static
30+
Iceberg::iceberg_rest_static)

‎src/iceberg/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ 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_CATALOG)
140+
if(ICEBERG_BUILD_REST)
141141
list(APPEND ICEBERG_BUNDLE_STATIC_BUILD_INTERFACE_LIBS
142142
"$<IF:$<TARGET_EXISTS:CURL::libcurl>,CURL::libcurl,CURL::libcurl>"
143143
"$<IF:$<TARGET_EXISTS:cpr::cpr>,cpr::cpr,cpr::cpr>")
@@ -149,7 +149,7 @@ if(ICEBERG_BUILD_BUNDLE)
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_CATALOG)
152+
if(ICEBERG_BUILD_REST)
153153
list(APPEND ICEBERG_BUNDLE_SHARED_BUILD_INTERFACE_LIBS
154154
"$<IF:$<TARGET_EXISTS:CURL::libcurl>,CURL::libcurl,CURL::libcurl>"
155155
"$<IF:$<TARGET_EXISTS:cpr::cpr>,cpr::cpr,cpr::cpr>")
@@ -162,7 +162,7 @@ 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_CATALOG)
165+
if(ICEBERG_BUILD_REST)
166166
list(APPEND
167167
ICEBERG_BUNDLE_STATIC_INSTALL_INTERFACE_LIBS
168168
"$<IF:$<BOOL:${CURL_VENDORED}>,Iceberg::libcurl_static,$<IF:$<TARGET_EXISTS:CURL::libcurl>,CURL::libcurl,CURL::libcurl>>"
@@ -176,7 +176,7 @@ if(ICEBERG_BUILD_BUNDLE)
176176
"$<IF:$<BOOL:${ARROW_VENDORED}>,Iceberg::parquet_static,$<IF:$<TARGET_EXISTS:Parquet::parquet_shared>,Parquet::parquet_shared,Parquet::parquet_static>>"
177177
"$<IF:$<BOOL:${AVRO_VENDORED}>,Iceberg::avrocpp_s,$<IF:$<TARGET_EXISTS:avro-cpp::avrocpp_shared>,avro-cpp::avrocpp_shared,avro-cpp::avrocpp_static>>"
178178
)
179-
if(ICEBERG_BUILD_REST_CATALOG)
179+
if(ICEBERG_BUILD_REST)
180180
list(APPEND
181181
ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS
182182
"$<IF:$<BOOL:${CURL_VENDORED}>,Iceberg::libcurl_static,$<IF:$<TARGET_EXISTS:CURL::libcurl>,CURL::libcurl,CURL::libcurl>>"

‎src/iceberg/catalog/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717

1818
iceberg_install_all_headers(iceberg/catalog)
1919

20-
if(ICEBERG_BUILD_REST_CATALOG)
20+
if(ICEBERG_BUILD_REST)
2121
add_subdirectory(rest)
2222
endif()

‎src/iceberg/catalog/rest/CMakeLists.txt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,40 +15,40 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
if(NOT ICEBERG_BUILD_REST_CATALOG)
18+
if(NOT ICEBERG_BUILD_REST)
1919
return()
2020
endif()
2121

22-
set(ICEBERG_REST_CATALOG_SOURCES rest_catalog.cc)
22+
set(ICEBERG_REST_SOURCES rest_catalog.cc)
2323

24-
set(ICEBERG_REST_CATALOG_STATIC_BUILD_INTERFACE_LIBS)
25-
set(ICEBERG_REST_CATALOG_SHARED_BUILD_INTERFACE_LIBS)
26-
set(ICEBERG_REST_CATALOG_STATIC_INSTALL_INTERFACE_LIBS)
27-
set(ICEBERG_REST_CATALOG_SHARED_INSTALL_INTERFACE_LIBS)
24+
set(ICEBERG_REST_STATIC_BUILD_INTERFACE_LIBS)
25+
set(ICEBERG_REST_SHARED_BUILD_INTERFACE_LIBS)
26+
set(ICEBERG_REST_STATIC_INSTALL_INTERFACE_LIBS)
27+
set(ICEBERG_REST_SHARED_INSTALL_INTERFACE_LIBS)
2828

29-
list(APPEND ICEBERG_REST_CATALOG_STATIC_BUILD_INTERFACE_LIBS
29+
list(APPEND ICEBERG_REST_STATIC_BUILD_INTERFACE_LIBS
3030
"$<IF:$<TARGET_EXISTS:iceberg_static>,iceberg_static,iceberg_shared>" cpr::cpr)
31-
list(APPEND ICEBERG_REST_CATALOG_SHARED_BUILD_INTERFACE_LIBS
31+
list(APPEND ICEBERG_REST_SHARED_BUILD_INTERFACE_LIBS
3232
"$<IF:$<TARGET_EXISTS:iceberg_shared>,iceberg_shared,iceberg_static>" cpr::cpr)
3333
list(APPEND
34-
ICEBERG_REST_CATALOG_STATIC_INSTALL_INTERFACE_LIBS
34+
ICEBERG_REST_STATIC_INSTALL_INTERFACE_LIBS
3535
"$<IF:$<TARGET_EXISTS:Iceberg::iceberg_static>,Iceberg::iceberg_static,Iceberg::iceberg_shared>"
3636
"$<IF:$<BOOL:${CPR_VENDORED}>,Iceberg::cpr,cpr::cpr>")
3737
list(APPEND
38-
ICEBERG_REST_CATALOG_SHARED_INSTALL_INTERFACE_LIBS
38+
ICEBERG_REST_SHARED_INSTALL_INTERFACE_LIBS
3939
"$<IF:$<TARGET_EXISTS:Iceberg::iceberg_shared>,Iceberg::iceberg_shared,Iceberg::iceberg_static>"
4040
"$<IF:$<BOOL:${CPR_VENDORED}>,Iceberg::cpr,cpr::cpr>")
4141

42-
add_iceberg_lib(iceberg_rest_catalog
42+
add_iceberg_lib(iceberg_rest
4343
SOURCES
44-
${ICEBERG_REST_CATALOG_SOURCES}
44+
${ICEBERG_REST_SOURCES}
4545
SHARED_LINK_LIBS
46-
${ICEBERG_REST_CATALOG_SHARED_BUILD_INTERFACE_LIBS}
46+
${ICEBERG_REST_SHARED_BUILD_INTERFACE_LIBS}
4747
STATIC_LINK_LIBS
48-
${ICEBERG_REST_CATALOG_STATIC_BUILD_INTERFACE_LIBS}
48+
${ICEBERG_REST_STATIC_BUILD_INTERFACE_LIBS}
4949
STATIC_INSTALL_INTERFACE_LIBS
50-
${ICEBERG_REST_CATALOG_STATIC_INSTALL_INTERFACE_LIBS}
50+
${ICEBERG_REST_STATIC_INSTALL_INTERFACE_LIBS}
5151
SHARED_INSTALL_INTERFACE_LIBS
52-
${ICEBERG_REST_CATALOG_SHARED_INSTALL_INTERFACE_LIBS})
52+
${ICEBERG_REST_SHARED_INSTALL_INTERFACE_LIBS})
5353

5454
iceberg_install_all_headers(iceberg/catalog/rest)

0 commit comments

Comments
 (0)