This is an automated email from the ASF dual-hosted git repository.
paleolimbot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-nanoarrow.git
The following commit(s) were added to refs/heads/main by this push:
new b3f35570 chore: Add options to CMake configuration for vcpkg build
(#788)
b3f35570 is described below
commit b3f35570b92ae11f9133996cf465d94d47993e7c
Author: Dewey Dunnington <[email protected]>
AuthorDate: Fri Jun 20 09:40:18 2025 -0500
chore: Add options to CMake configuration for vcpkg build (#788)
The vcpkg checks for a dry run of the current state of the main branch (
https://github.com/microsoft/vcpkg/pull/46029 ) fail because (1)
`-Werror` is always set in debug mode and there's at least one platform
where we get some extra warnings and (2) we install shared libraries
when static linkage was requested. This PR adds options so we can turn
those off in the vcpkg config.
---
CMakeLists.txt | 63 +++++++++++++++++++++++++++++++++-------------------------
1 file changed, 36 insertions(+), 27 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d008690f..91f62d3e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,6 +58,10 @@ option(NANOARROW_BUNDLE_AS_CPP "Bundle nanoarrow source file
as nanoarrow.cc" OF
option(NANOARROW_CODE_COVERAGE "Enable coverage reporting" OFF)
option(NANOARROW_ARROW_STATIC
"Use a statically-linked Arrow C++ build when linking tests" OFF)
+option(NANOARROW_DEBUG_EXTRA_WARNINGS "Use extra warnings when compiling in
debug mode"
+ ON)
+# For vcpkg, where there's a check that fails if .dlls are present for static
linkage
+option(NANOARROW_INSTALL_SHARED "Install shared libraries" ON)
if(NOT DEFINED CMAKE_C_STANDARD)
if(NANOARROW_IPC)
@@ -481,36 +485,41 @@ foreach(target
endif()
# Ensure target is added to nanoarrow-exports
- install(TARGETS ${target}
- EXPORT nanoarrow-exports
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ if(((target_type STREQUAL "SHARED_LIBRARY") AND NANOARROW_INSTALL_SHARED)
+ OR NOT (target_type STREQUAL "SHARED_LIBRARY"))
+ install(TARGETS ${target}
+ EXPORT nanoarrow-exports
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
# For debug builds, ensure we aggressively set compiler warning flags and
# error for any compiler warnings
- if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
- target_compile_options(${target}
- PRIVATE $<$<CONFIG:Debug>:-Wall
- -Werror
- -Wextra
- -Wpedantic
- -Wno-type-limits
- -Wmaybe-uninitialized
- -Wunused-result
- -Wconversion
- -Wno-sign-conversion>)
- target_compile_options(${target} PRIVATE -Wno-misleading-indentation)
- elseif(CMAKE_C_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_C_COMPILER_ID
STREQUAL
- "Clang")
- target_compile_options(${target}
- PRIVATE $<$<CONFIG:Debug>:-Wall
- -Werror
- -Wextra
- -Wpedantic
- -Wdocumentation
- -Wconversion
- -Wno-sign-conversion>)
+ if(NANOARROW_DEBUG_EXTRA_WARNINGS)
+ if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+ target_compile_options(${target}
+ PRIVATE $<$<CONFIG:Debug>:-Wall
+ -Werror
+ -Wextra
+ -Wpedantic
+ -Wno-type-limits
+ -Wmaybe-uninitialized
+ -Wunused-result
+ -Wconversion
+ -Wno-sign-conversion>)
+ target_compile_options(${target} PRIVATE -Wno-misleading-indentation)
+ elseif(CMAKE_C_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_C_COMPILER_ID
STREQUAL
+ "Clang")
+ target_compile_options(${target}
+ PRIVATE $<$<CONFIG:Debug>:-Wall
+ -Werror
+ -Wextra
+ -Wpedantic
+ -Wdocumentation
+ -Wconversion
+ -Wno-sign-conversion>)
+ endif()
endif()
endif()
endforeach()
