Skip to content

Commit 80e0a4b

Browse files
committed
let libiceberg_arrow depend on libiceberg_core
1 parent 8c09208 commit 80e0a4b

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if(NOT CMAKE_BUILD_TYPE)
2121
set(CMAKE_BUILD_TYPE Debug)
2222
endif()
2323

24-
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")
24+
list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")
2525

2626
project(Iceberg
2727
VERSION 0.1.0

example/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,5 @@ find_package(Iceberg CONFIG REQUIRED)
2626

2727
add_executable(demo_example demo_example.cc)
2828

29-
target_link_libraries(demo_example
30-
PRIVATE Iceberg::iceberg_core_static Iceberg::iceberg_puffin_static
31-
Iceberg::iceberg_arrow_static)
29+
target_link_libraries(demo_example PRIVATE Iceberg::iceberg_puffin_static
30+
Iceberg::iceberg_arrow_static)

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
add_subdirectory(arrow)
1918
add_subdirectory(core)
2019
add_subdirectory(puffin)
20+
add_subdirectory(arrow)
2121

2222
iceberg_install_cmake_package(Iceberg iceberg_targets)

src/IcebergConfig.cmake.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ macro(iceberg_find_components components)
6969
endforeach()
7070
endmacro()
7171

72+
# Find system dependencies
73+
iceberg_find_dependencies("${ICEBERG_SYSTEM_DEPENDENCIES}")
74+
7275
include("${CMAKE_CURRENT_LIST_DIR}/IcebergTargets.cmake")
7376

7477
# Find required components
7578
iceberg_find_components("${Iceberg_FIND_COMPONENTS}")
7679

77-
# Find system dependencies
78-
iceberg_find_dependencies("${ICEBERG_SYSTEM_DEPENDENCIES}")
79-
8080
check_required_components(Iceberg)

src/arrow/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,14 @@ else()
4646
"$<IF:$<TARGET_EXISTS:Arrow::arrow_shared>,Arrow::arrow_shared,Arrow::arrow_static>"
4747
)
4848
endif()
49+
4950
list(APPEND
5051
ICEBERG_ARROW_STATIC_INSTALL_INTERFACE_LIBS
51-
"$<IF:$<TARGET_EXISTS:iceberg_core_static>,Iceberg::iceberg_core_static,Iceberg::iceberg_core_shared>"
52+
"$<IF:$<TARGET_EXISTS:Iceberg::iceberg_core_static>,Iceberg::iceberg_core_static,Iceberg::iceberg_core_shared>"
5253
)
5354
list(APPEND
5455
ICEBERG_ARROW_SHARED_INSTALL_INTERFACE_LIBS
55-
"$<IF:$<TARGET_EXISTS:iceberg_core_shared>,Iceberg::iceberg_core_shared,Iceberg::iceberg_core_static>"
56+
"$<IF:$<TARGET_EXISTS:Iceberg::iceberg_core_shared>,Iceberg::iceberg_core_shared,Iceberg::iceberg_core_static>"
5657
)
5758

5859
add_iceberg_lib(iceberg_arrow

0 commit comments

Comments
 (0)