Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")
# vcpkg (ab)uses CMAKE_TOOLCHAIN_FILE to inject its logic into CMake
if(ARROW_DEPENDENCY_SOURCE STREQUAL "VCPKG")
include(Usevcpkg)
elseif(ARROW_PACKAGE_KIND STREQUAL "vcpkg")
set(ARROW_VCPKG ON)
endif()

project(arrow VERSION "${ARROW_BASE_VERSION}")
Expand Down
9 changes: 6 additions & 3 deletions cpp/cmake_modules/FindSnappyAlt.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,12 @@ if(Snappy_FOUND)
set(SnappyAlt_FOUND TRUE)
return()
else()
# The Conan's Snappy package always uses Snappy::snappy and it's
# an INTERFACE_LIBRARY.
get_target_property(Snappy Snappy::snappy TYPE)
# The Snappy packages in Conan and vcpkg always use
# Snappy::snappy.
#
# The Snappy package in Conan use an INTERFACE_LIBRARY for
# Snappy::snappy.
get_target_property(Snappy_TYPE Snappy::snappy TYPE)
if(Snappy_TYPE STREQUAL "STATIC_LIBRARY" OR Snappy_TYPE STREQUAL
"INTERFACE_LIBRARY")
set(Snappy_TARGET Snappy::snappy)
Expand Down
Loading