Skip to content

Commit a8cec82

Browse files
committed
fix review1
1 parent a94e6a2 commit a8cec82

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

cmake_modules/IcebergThirdpartyToolchain.cmake

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -436,9 +436,7 @@ endfunction()
436436
function(resolve_curl_dependency)
437437
prepare_fetchcontent()
438438

439-
set(BUILD_CURL_EXE
440-
OFF
441-
CACHE BOOL "" FORCE)
439+
set(BUILD_CURL_EXE OFF)
442440
set(BUILD_TESTING
443441
OFF
444442
CACHE BOOL "" FORCE)
@@ -472,6 +470,7 @@ function(resolve_curl_dependency)
472470
fetchcontent_makeavailable(CURL)
473471

474472
if(TARGET OpenSSL::SSL)
473+
# curl depends on the system's OpenSSL
475474
message(STATUS "Adding OpenSSL to the system dependency list.")
476475
list(APPEND ICEBERG_SYSTEM_DEPENDENCIES OpenSSL)
477476
endif()
@@ -494,8 +493,6 @@ function(resolve_curl_dependency)
494493
ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}"
495494
LIBRARY DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
496495
message(STATUS "Use vendored CURL")
497-
498-
list(APPEND ICEBERG_SYSTEM_DEPENDENCIES OpenSSL)
499496
else()
500497
set(CURL_VENDORED FALSE)
501498
list(APPEND ICEBERG_SYSTEM_DEPENDENCIES CURL)
@@ -600,8 +597,10 @@ resolve_croaring_dependency()
600597
resolve_nlohmann_json_dependency()
601598
resolve_spdlog_dependency()
602599

603-
resolve_curl_dependency()
604-
resolve_cpr_dependency()
600+
if(ICEBERG_BUILD_REST_CATALOG)
601+
resolve_curl_dependency()
602+
resolve_cpr_dependency()
603+
endif()
605604

606605
if(ICEBERG_BUILD_BUNDLE)
607606
resolve_arrow_dependency()

0 commit comments

Comments
 (0)