diff --git a/README.md b/README.md index 8c711bf..c3a9211 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ ![Vcpkg Version](https://img.shields.io/vcpkg/v/bbalouki-itch) [![C++20](https://img.shields.io/badge/C++-20-blue.svg)](https://isocpp.org/std/the-standard) [![CMake](https://img.shields.io/badge/CMake-3.25+-blue.svg)](https://cmake.org/) +[![PyPi status](https://img.shields.io/pypi/status/itchcpp.svg?maxAge=60)](https://pypi.python.org/pypi/itchcpp) +[![PYPI Version](https://img.shields.io/pypi/v/itchcpp)](https://pypi.org/project/itchcpp/) [![CodeFactor](https://www.codefactor.io/repository/github/bbalouki/itchcpp/badge)](https://www.codefactor.io/repository/github/bbalouki/itchcpp) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) [![LinkedIn](https://img.shields.io/badge/LinkedIn-grey?logo=Linkedin&logoColor=white)](https://www.linkedin.com/in/bertin-balouki-simyeli-15b17a1a6/) diff --git a/VERSION.txt b/VERSION.txt index dc1e644..9c6d629 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -1.6.0 +1.6.1 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b74fcff..f7ad09a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -26,8 +26,24 @@ if(${PROJECT_NAME}_WITH_ARROW) find_package(Arrow CONFIG REQUIRED) find_package(Parquet CONFIG REQUIRED) target_compile_definitions(itch PUBLIC ITCH_WITH_ARROW) - target_link_libraries(itch PUBLIC Arrow::arrow_shared Parquet::parquet_shared) - message(STATUS "ITCH: Apache Arrow / Parquet export enabled") + + # Arrow's CMake config only exports the *_shared targets when Arrow was + # itself built as a shared library; static-linkage triplets/toolchains + # (many vcpkg triplets, static system installs, ...) only provide + # *_static. Pick whichever pair actually exists instead of assuming shared. + if(TARGET Arrow::arrow_shared) + set(ITCH_ARROW_TARGET Arrow::arrow_shared) + else() + set(ITCH_ARROW_TARGET Arrow::arrow_static) + endif() + if(TARGET Parquet::parquet_shared) + set(ITCH_PARQUET_TARGET Parquet::parquet_shared) + else() + set(ITCH_PARQUET_TARGET Parquet::parquet_static) + endif() + + target_link_libraries(itch PUBLIC ${ITCH_ARROW_TARGET} ${ITCH_PARQUET_TARGET}) + message(STATUS "ITCH: Apache Arrow / Parquet export enabled (${ITCH_ARROW_TARGET}, ${ITCH_PARQUET_TARGET})") endif() add_library(itch::itch ALIAS itch) if (NOT ANDROID)