diff --git a/cpp/cmake_modules/FindBrotliAlt.cmake b/cpp/cmake_modules/FindBrotliAlt.cmake index 3c90329be9651..aa7495664861f 100644 --- a/cpp/cmake_modules/FindBrotliAlt.cmake +++ b/cpp/cmake_modules/FindBrotliAlt.cmake @@ -21,7 +21,7 @@ if(BrotliAlt_FOUND) return() endif() -if(ARROW_PACKAGE_KIND STREQUAL "vcpkg" OR ARROW_PACKAGE_KIND STREQUAL "conan") +if(ARROW_VCPKG OR ARROW_PACKAGE_KIND STREQUAL "conan") set(find_package_args "") if(BrotliAlt_FIND_VERSION) list(APPEND find_package_args ${BrotliAlt_FIND_VERSION}) @@ -32,14 +32,14 @@ if(ARROW_PACKAGE_KIND STREQUAL "vcpkg" OR ARROW_PACKAGE_KIND STREQUAL "conan") if(BrotliAlt_FIND_REQUIRED) list(APPEND find_package_args REQUIRED) endif() - if(ARROW_PACKAGE_KIND STREQUAL "vcpkg") + if(ARROW_VCPKG) find_package(BrotliAlt NAMES unofficial-brotli ${find_package_args}) else() find_package(BrotliAlt NAMES brotli ${find_package_args}) endif() set(Brotli_FOUND ${BrotliAlt_FOUND}) if(BrotliAlt_FOUND) - if(ARROW_PACKAGE_KIND STREQUAL "vcpkg") + if(ARROW_VCPKG) add_library(Brotli::brotlicommon ALIAS unofficial::brotli::brotlicommon) add_library(Brotli::brotlienc ALIAS unofficial::brotli::brotlienc) add_library(Brotli::brotlidec ALIAS unofficial::brotli::brotlidec) diff --git a/cpp/cmake_modules/Findutf8proc.cmake b/cpp/cmake_modules/Findutf8proc.cmake index 9721f76f0631b..75d459d0ec74e 100644 --- a/cpp/cmake_modules/Findutf8proc.cmake +++ b/cpp/cmake_modules/Findutf8proc.cmake @@ -19,7 +19,7 @@ if(utf8proc_FOUND) return() endif() -if(ARROW_PACKAGE_KIND STREQUAL "vcpkg" OR VCPKG_TOOLCHAIN) +if(ARROW_VCPKG) set(find_package_args "") if(utf8proc_FIND_VERSION) list(APPEND find_package_args ${utf8proc_FIND_VERSION}) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index 2cca9cd4b400b..355d2e14481ef 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -2906,7 +2906,7 @@ endmacro() if(ARROW_WITH_UTF8PROC) set(utf8proc_resolve_dependency_args utf8proc PC_PACKAGE_NAMES libutf8proc) - if(NOT VCPKG_TOOLCHAIN) + if(NOT ARROW_VCPKG) # utf8proc in vcpkg doesn't provide version information: # https://github.com/microsoft/vcpkg/issues/39176 list(APPEND utf8proc_resolve_dependency_args REQUIRED_VERSION "2.2.0")