Skip to content

Commit b36b971

Browse files
author
nullccxsy
committed
fix comments
1 parent 93d4f81 commit b36b971

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/iceberg/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,28 +61,28 @@ set(ICEBERG_SHARED_INSTALL_INTERFACE_LIBS)
6161
list(APPEND
6262
ICEBERG_STATIC_BUILD_INTERFACE_LIBS
6363
nanoarrow::nanoarrow_static
64-
roaring::roaring
6564
nlohmann_json::nlohmann_json
65+
roaring::roaring
6666
spdlog::spdlog
6767
ZLIB::ZLIB)
6868
list(APPEND
6969
ICEBERG_SHARED_BUILD_INTERFACE_LIBS
7070
nanoarrow::nanoarrow_shared
71-
roaring::roaring
7271
nlohmann_json::nlohmann_json
72+
roaring::roaring
7373
spdlog::spdlog
7474
ZLIB::ZLIB)
7575
list(APPEND
7676
ICEBERG_STATIC_INSTALL_INTERFACE_LIBS
7777
"$<IF:$<BOOL:${NANOARROW_VENDORED}>,Iceberg::nanoarrow_static,$<IF:$<TARGET_EXISTS:nanoarrow::nanoarrow_static>,nanoarrow::nanoarrow_static,nanoarrow::nanoarrow_shared>>"
78-
"$<IF:$<BOOL:${CROARING_VENDORED}>,Iceberg::roaring,$<IF:$<TARGET_EXISTS:roaring::roaring>,roaring::roaring,roaring::roaring>>"
7978
"$<IF:$<BOOL:${NLOHMANN_JSON_VENDORED}>,Iceberg::nlohmann_json,$<IF:$<TARGET_EXISTS:nlohmann_json::nlohmann_json>,nlohmann_json::nlohmann_json,nlohmann_json::nlohmann_json>>"
79+
"$<IF:$<BOOL:${CROARING_VENDORED}>,Iceberg::roaring,roaring::roaring>"
8080
"$<IF:$<BOOL:${SPDLOG_VENDORED}>,Iceberg::spdlog,spdlog::spdlog>")
8181
list(APPEND
8282
ICEBERG_SHARED_INSTALL_INTERFACE_LIBS
8383
"$<IF:$<BOOL:${NANOARROW_VENDORED}>,Iceberg::nanoarrow_shared,$<IF:$<TARGET_EXISTS:nanoarrow::nanoarrow_shared>,nanoarrow::nanoarrow_shared,nanoarrow::nanoarrow_static>>"
84-
"$<IF:$<BOOL:${CROARING_VENDORED}>,Iceberg::roaring,$<IF:$<TARGET_EXISTS:roaring::roaring>,roaring::roaring,roaring::roaring>>"
8584
"$<IF:$<BOOL:${NLOHMANN_JSON_VENDORED}>,Iceberg::nlohmann_json,$<IF:$<TARGET_EXISTS:nlohmann_json::nlohmann_json>,nlohmann_json::nlohmann_json,nlohmann_json::nlohmann_json>>"
85+
"$<IF:$<BOOL:${CROARING_VENDORED}>,Iceberg::roaring,roaring::roaring>"
8686
"$<IF:$<BOOL:${SPDLOG_VENDORED}>,Iceberg::spdlog,spdlog::spdlog>")
8787

8888
add_iceberg_lib(iceberg

src/iceberg/IcebergConfig.cmake.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ macro(iceberg_find_components components)
6767
endforeach()
6868
endmacro()
6969

70+
include("${CMAKE_CURRENT_LIST_DIR}/IcebergTargets.cmake")
71+
7072
# Find system dependencies
7173
iceberg_find_dependencies("${ICEBERG_SYSTEM_DEPENDENCIES}")
7274

@@ -79,8 +81,6 @@ if(NOT TARGET roaring::roaring-headers-cpp)
7981
add_library(roaring::roaring-headers-cpp INTERFACE IMPORTED)
8082
endif()
8183

82-
include("${CMAKE_CURRENT_LIST_DIR}/IcebergTargets.cmake")
83-
8484
if(TARGET Iceberg::arrow_static)
8585
add_library(Arrow::arrow_static ALIAS Iceberg::arrow_static)
8686

0 commit comments

Comments
 (0)