Skip to content

Commit c3ea283

Browse files
committed
revert cmake
1 parent 0215e36 commit c3ea283

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

cmake_modules/IcebergThirdpartyToolchain.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ function(resolve_arrow_dependency)
9797
set(ARROW_WITH_ZLIB ON)
9898
set(ZLIB_SOURCE "SYSTEM")
9999
set(ARROW_VERBOSE_THIRDPARTY_BUILD OFF)
100-
set(CMAKE_CXX_STANDARD 17)
101100

102101
fetchcontent_declare(VendoredArrow
103102
${FC_DECLARE_COMMON_OPTIONS}
@@ -324,7 +323,7 @@ function(resolve_croaring_dependency)
324323
set(CROARING_URL "$ENV{ICEBERG_CROARING_URL}")
325324
else()
326325
set(CROARING_URL
327-
"https://github.com/RoaringBitmap/CRoaring/archive/refs/tags/v4.4.3.tar.gz")
326+
"https://github.com/RoaringBitmap/CRoaring/archive/refs/tags/v4.3.11.tar.gz")
328327
endif()
329328

330329
fetchcontent_declare(croaring
@@ -543,7 +542,7 @@ function(resolve_cpr_dependency)
543542
RUNTIME DESTINATION "${ICEBERG_INSTALL_BINDIR}"
544543
ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}"
545544
LIBRARY DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
546-
list(APPEND ICEBERG_SYSTEM_DEPENDENCIES OpenSSL CURL)
545+
list(APPEND ICEBERG_SYSTEM_DEPENDENCIES OpenSSL)
547546
else()
548547
set(CPR_VENDORED FALSE)
549548
list(APPEND ICEBERG_SYSTEM_DEPENDENCIES cpr)

src/iceberg/iceberg-config.cmake.in

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,19 @@ endmacro()
7272
# Find system dependencies
7373
iceberg_find_dependencies("${ICEBERG_SYSTEM_DEPENDENCIES}")
7474

75+
# Create missing CRoaring targets if they don't exist
76+
if(NOT TARGET roaring::roaring-headers)
77+
add_library(roaring::roaring-headers INTERFACE IMPORTED)
78+
endif()
79+
80+
if(NOT TARGET roaring::roaring-headers-cpp)
81+
add_library(roaring::roaring-headers-cpp INTERFACE IMPORTED)
82+
endif()
83+
84+
if(NOT TARGET CURL::libcurl)
85+
add_library(CURL::libcurl INTERFACE IMPORTED)
86+
endif()
87+
7588
include("${CMAKE_CURRENT_LIST_DIR}/iceberg-targets.cmake")
7689

7790
if(TARGET iceberg::arrow_static)

0 commit comments

Comments
 (0)