Skip to content

Fix install dirs #715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paleolimbot merged 1 commit into from
Mar 8, 2025
Merged

Fix install dirs #715

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 26 additions & 12 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ set(NANOARROW_VERSION_MAJOR "${nanoarrow_VERSION_MAJOR}")
set(NANOARROW_VERSION_MINOR "${nanoarrow_VERSION_MINOR}")
set(NANOARROW_VERSION_PATCH "${nanoarrow_VERSION_PATCH}")

include(GNUInstallDirs)

# General options
option(NANOARROW_NAMESPACE "A prefix for exported symbols" OFF)

Expand Down Expand Up @@ -77,8 +79,10 @@ endif()

add_library(nanoarrow_coverage_config INTERFACE)
install(TARGETS nanoarrow_coverage_config
DESTINATION lib
EXPORT nanoarrow-exports)
EXPORT nanoarrow-exports
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

if(NANOARROW_CODE_COVERAGE)
target_compile_options(nanoarrow_coverage_config INTERFACE -O0 -g --coverage)
Expand Down Expand Up @@ -186,8 +190,10 @@ if(NANOARROW_IPC)
PUBLIC $<BUILD_INTERFACE:${NANOARROW_FLATCC_INCLUDE_DIR}>
$<INSTALL_INTERFACE:include>)
install(TARGETS flatccrt
DESTINATION lib
EXPORT nanoarrow-exports)
EXPORT nanoarrow-exports
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

elseif(NOT NANOARROW_FLATCC_ROOT_DIR)
add_library(flatccrt STATIC IMPORTED)
Expand Down Expand Up @@ -240,7 +246,10 @@ if(NANOARROW_IPC)
$<BUILD_INTERFACE:${NANOARROW_IPC_FLATCC_INCLUDE_DIR}>
$<INSTALL_INTERFACE:include>)

install(TARGETS nanoarrow_ipc DESTINATION lib)
install(TARGETS nanoarrow_ipc
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES src/nanoarrow/nanoarrow_ipc.h src/nanoarrow/nanoarrow_ipc.hpp
src/nanoarrow/ipc/flatcc_generated.h DESTINATION include/nanoarrow)
install(FILES src/nanoarrow/hpp/array_stream.hpp
Expand Down Expand Up @@ -303,8 +312,10 @@ if(NANOARROW_DEVICE)
target_include_directories(nanoarrow_metal_impl
PRIVATE ${NANOARROW_DEVICE_INCLUDE_METAL})
install(TARGETS nanoarrow_metal_impl
DESTINATION lib
EXPORT nanoarrow-exports)
EXPORT nanoarrow-exports
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

set(NANOARROW_DEVICE_SOURCES_METAL src/nanoarrow/device/metal.cc)
set(NANOARROW_DEVICE_DEFS_METAL "NANOARROW_DEVICE_WITH_METAL")
Expand Down Expand Up @@ -359,8 +370,10 @@ if(NANOARROW_TESTING

add_subdirectory("thirdparty/nlohmann_json")
install(TARGETS nlohmann_json
DESTINATION lib
EXPORT nanoarrow-exports)
EXPORT nanoarrow-exports
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

add_library(nanoarrow_testing src/nanoarrow/testing/testing.cc)
target_include_directories(nanoarrow_testing
Expand Down Expand Up @@ -405,8 +418,10 @@ foreach(target

# Ensure target is added to nanoarrow-exports
install(TARGETS ${target}
DESTINATION lib
EXPORT nanoarrow-exports)
EXPORT nanoarrow-exports
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

# For debug builds, ensure we aggressively set compiler warning flags and
# error for any compiler warnings
Expand Down Expand Up @@ -701,7 +716,6 @@ endif()

# Generate package files for the build and install trees.
include(CMakePackageConfigHelpers)
include(GNUInstallDirs)

foreach(tree_type BUILD INSTALL)
if(tree_type STREQUAL "BUILD")
Expand Down