simplify ThirdpartyToolchain.cmake

Author: wgtmac

README.md

@@ -32,32 +32,27 @@ C++ implementation of [Apache Iceberg™](https://iceberg.apache.org/).
 
 ```bash
 cd iceberg-cpp
-mkdir build && cd build
-cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/install -DICEBERG_BUILD_STATIC=ON -DICEBERG_BUILD_SHARED=ON
-cmake --build .
-cmake --install .
+cmake -S . -B build -DCMAKE_INSTALL_PREFIX=/path/to/install -DICEBERG_BUILD_STATIC=ON -DICEBERG_BUILD_SHARED=ON
+cmake --build build
+cmake --install build
 ```
 
 ### Build and Install Iceberg Arrow Library
 
 #### Vendored Apache Arrow (default)
 
 ```bash
-cd iceberg-cpp/src/arrow
-mkdir build && cd build
-cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/install -DICEBERG_ARROW=ON
-cmake --build .
-cmake --install .
+cmake -S . -B build -DCMAKE_INSTALL_PREFIX=/path/to/install -DICEBERG_ARROW=ON
+cmake --build build
+cmake --install build
 ```
 
 #### Provided Apache Arrow
 
 ```bash
-cd iceberg-cpp/src/arrow
-mkdir build && cd build
-cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/install -DCMAKE_PREFIX_PATH=/path/to/arrow -DICEBERG_ARROW=ON
-cmake --build .
-cmake --install .
+cmake -S . -B build -DCMAKE_INSTALL_PREFIX=/path/to/install -DCMAKE_PREFIX_PATH=/path/to/arrow -DICEBERG_ARROW=ON
+cmake --build build
+cmake --install build
 ```
 
 ### Build Examples
@@ -66,9 +61,8 @@ After installing the core libraries, you can build the examples:
 
 ```bash
 cd iceberg-cpp/example
-mkdir build && cd build
-cmake .. -DCMAKE_PREFIX_PATH=/path/to/install
-cmake --build .
+cmake -S . -B build -DCMAKE_PREFIX_PATH=/path/to/install
+cmake --build build
 ```
 
 If you are using provided Apache Arrow, you need to include `/path/to/arrow` in `CMAKE_PREFIX_PATH` as below.

cmake_modules/ThirdpartyToolchain.cmake

@@ -27,15 +27,13 @@ set(ICEBERG_ARROW_INSTALL_INTERFACE_LIBS)
 set(ICEBERG_ARROW_BUILD_VERSION "18.1.0")
 set(ICEBERG_ARROW_BUILD_SHA256_CHECKSUM
     "2dc8da5f8796afe213ecc5e5aba85bb82d91520eff3cf315784a52d0fa61d7fc")
-set(ARROW_VENDORED TRUE)
 
 if(DEFINED ENV{ICEBERG_ARROW_URL})
   set(ARROW_SOURCE_URL "$ENV{ICEBERG_ARROW_URL}")
 else()
   set(ARROW_SOURCE_URL
       "https://www.apache.org/dyn/closer.cgi?action=download&filename=/arrow/arrow-${ICEBERG_ARROW_BUILD_VERSION}/apache-arrow-${ICEBERG_ARROW_BUILD_VERSION}.tar.gz"
       "https://downloads.apache.org/arrow/arrow-${ICEBERG_ARROW_BUILD_VERSION}/apache-arrow-${ICEBERG_ARROW_BUILD_VERSION}.tar.gz"
-      "https://github.com/apache/arrow/releases/download/apache-arrow-${ICEBERG_ARROW_BUILD_VERSION}/apache-arrow-${ICEBERG_ARROW_BUILD_VERSION}.tar.gz"
   )
 endif()
 
@@ -101,18 +99,18 @@ function(resolve_arrow_dependency)
 
   fetchcontent_makeavailable(Arrow)
 
-  if(NOT TARGET Arrow::arrow_static)
-    add_library(Arrow::arrow_static INTERFACE IMPORTED)
-    target_link_libraries(Arrow::arrow_static INTERFACE arrow_static)
-    target_include_directories(Arrow::arrow_static INTERFACE ${arrow_SOURCE_DIR}/cpp/src
-                                                             ${arrow_BINARY_DIR}/src)
-  endif()
-
-  fetchcontent_getproperties(Arrow)
   if(arrow_SOURCE_DIR)
+    if(NOT TARGET Arrow::arrow_static)
+      add_library(Arrow::arrow_static INTERFACE IMPORTED)
+      target_link_libraries(Arrow::arrow_static INTERFACE arrow_static)
+      target_include_directories(Arrow::arrow_static
+                                 INTERFACE ${arrow_BINARY_DIR}/src
+                                           ${arrow_SOURCE_DIR}/cpp/src)
+    endif()
+
     set(ARROW_VENDORED TRUE)
     install(TARGETS arrow_static
-            RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+            RUNTIME DESTINATION "${ICEBERG_INSTALL_BINDIR}"
             ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}"
             LIBRARY DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
 

src/config.cmake.in

@@ -65,7 +65,8 @@ macro(iceberg_find_components components)
 
   foreach(comp ${components})
     string(TOLOWER "${comp}" _comp_lower_case)
-    if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/iceberg-${_comp_lower_case}-targets.cmake")
+    if(TARGET "Iceberg::iceberg_${_comp_lower_case}_shared" OR
+       TARGET "Iceberg::iceberg_${_comp_lower_case}_static")
       set(Iceberg_${comp}_FOUND TRUE)
     else()
       set(Iceberg_${comp}_FOUND FALSE)