Skip to content

Commit 34cef75

Browse files
author
nullccxsy
committed
fix windows timeout
1 parent 2dc9392 commit 34cef75

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
windows:
7575
name: AMD64 Windows 2022
7676
runs-on: windows-2022
77-
timeout-minutes: 30
77+
timeout-minutes: 60
7878
steps:
7979
- name: Checkout iceberg-cpp
8080
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

cmake_modules/IcebergThirdpartyToolchain.cmake

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -254,23 +254,17 @@ function(resolve_nanoarrow_dependency)
254254
endif()
255255

256256
set(NANOARROW_VENDORED TRUE)
257-
if(TARGET nanoarrow_static)
258-
set_target_properties(nanoarrow_static
259-
PROPERTIES OUTPUT_NAME "iceberg_vendored_nanoarrow"
260-
POSITION_INDEPENDENT_CODE ON)
261-
install(TARGETS nanoarrow_static
262-
EXPORT iceberg_targets
263-
RUNTIME DESTINATION "${ICEBERG_INSTALL_BINDIR}"
264-
ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}"
265-
LIBRARY DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
266-
endif()
257+
set_target_properties(nanoarrow_static
258+
PROPERTIES OUTPUT_NAME "iceberg_vendored_nanoarrow"
259+
POSITION_INDEPENDENT_CODE ON)
260+
install(TARGETS nanoarrow_static
261+
EXPORT iceberg_targets
262+
RUNTIME DESTINATION "${ICEBERG_INSTALL_BINDIR}"
263+
ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}"
264+
LIBRARY DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
267265
else()
268266
set(NANOARROW_VENDORED FALSE)
269267
list(APPEND ICEBERG_SYSTEM_DEPENDENCIES nanoarrow)
270-
271-
if(TARGET nanoarrow::nanoarrow AND NOT TARGET nanoarrow::nanoarrow_static)
272-
add_library(nanoarrow::nanoarrow_static ALIAS nanoarrow::nanoarrow)
273-
endif()
274268
endif()
275269

276270
set(ICEBERG_SYSTEM_DEPENDENCIES
@@ -280,6 +274,7 @@ function(resolve_nanoarrow_dependency)
280274
${NANOARROW_VENDORED}
281275
PARENT_SCOPE)
282276
endfunction()
277+
endfunction()
283278

284279
# ----------------------------------------------------------------------
285280
# nlohmann-json

0 commit comments

Comments
 (0)