Skip to content

Commit 12f7123

Browse files
committed
1
1 parent d139516 commit 12f7123

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

cmake_modules/IcebergThirdpartyToolchain.cmake

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,10 @@ function(resolve_cpr_dependency)
256256
CACHE BOOL "" FORCE)
257257

258258
# Disable IDN support in curl to avoid linking issues
259+
set(CURL_DISABLE_INSTALL
260+
ON
261+
CACHE BOOL "" FORCE)
262+
259263
set(CURL_DISABLE_LDAP
260264
ON
261265
CACHE BOOL "" FORCE)
@@ -290,20 +294,11 @@ function(resolve_cpr_dependency)
290294
LIBRARY DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
291295

292296
if(TARGET libcurl_static)
293-
# 步骤 1: 为 libcurl_static 设置一个唯一的导出名称,避免与系统库冲突
294-
# 我们将其导出为 iceberg_libcurl_static
295297
set_target_properties(libcurl_static PROPERTIES EXPORT_NAME iceberg_libcurl_static)
296298

297-
# 步骤 2: 仍然安装原始的 libcurl_static 目标
298-
# CMake 在导出时会自动使用我们在上面设置的 EXPORT_NAME
299-
message(STATUS "Found vendored target 'libcurl_static', installing it with unique export name 'iceberg_libcurl_static'."
300-
)
301299
install(TARGETS libcurl_static
302300
EXPORT iceberg_targets
303301
ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
304-
else()
305-
message(WARNING "Could not find the real vendored target 'libcurl_static' to install."
306-
)
307302
endif()
308303

309304
set(CPR_VENDORED TRUE)

0 commit comments

Comments
 (0)