apacheGH-42017: [CI][Python][C++] Fix utf8proc detection for wheel on…

… Windows
kou · Jun 6, 2024 · ad25611 · ad25611
1 parent 9ee6ea7
commit ad25611
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/cpp/cmake_modules/Findutf8proc.cmake b/cpp/cmake_modules/Findutf8proc.cmake
@@ -19,11 +19,11 @@ if(utf8proc_FOUND)
   return()
 endif()
 
-if(ARROW_PACKAGE_KIND STREQUAL "vcpkg")
+if(ARROW_PACKAGE_KIND STREQUAL "vcpkg" OR VCPKG_ROOT)
   set(find_package_args "")
-  if(utf8proc_FIND_VERSION)
-    list(APPEND find_package_args ${utf8proc_FIND_VERSION})
-  endif()
+  # if(utf8proc_FIND_VERSION)
+  #   list(APPEND find_package_args ${utf8proc_FIND_VERSION})
+  # endif()
   if(utf8proc_FIND_QUIETLY)
     list(APPEND find_package_args QUIET)
   endif()

diff --git a/cpp/cmake_modules/Usevcpkg.cmake b/cpp/cmake_modules/Usevcpkg.cmake
@@ -237,9 +237,6 @@ set(LZ4_ROOT
     CACHE STRING "")
 
 if(CMAKE_HOST_WIN32)
-  set(utf8proc_MSVC_STATIC_LIB_SUFFIX
-      ""
-      CACHE STRING "")
   set(LZ4_MSVC_LIB_PREFIX
       ""
       CACHE STRING "")