[arrow] branch master updated: ARROW-16895: [R] Fix cmake version detection (#13429)

[ko...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 86915807af ARROW-16895: [R] Fix cmake version detection (#13429)
86915807af is described below

commit 86915807af6fe10f44bc881e57b2f425f97c56c7
Author: Neal Richardson <ne...@gmail.com>
AuthorDate: Thu Jun 23 19:49:58 2022 -0400

    ARROW-16895: [R] Fix cmake version detection (#13429)
    
    Discovered in https://github.com/apache/arrow/issues/13425
    
    Authored-by: Neal Richardson <ne...@gmail.com>
    Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
 r/tools/nixlibs.R | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/r/tools/nixlibs.R b/r/tools/nixlibs.R
index 5b8cc3b72d..768c629193 100644
--- a/r/tools/nixlibs.R
+++ b/r/tools/nixlibs.R
@@ -404,8 +404,10 @@ ensure_cmake <- function() {
   cmake
 }
 
-find_cmake <- function(paths, version_required = 3.10) {
+find_cmake <- function(paths, version_required = "3.10") {
   # Given a list of possible cmake paths, return the first one that exists and is new enough
+  # version_required should be a string or packageVersion; numeric version
+  # can be misleading (e.g. 3.10 is actually 3.1)
   for (path in paths) {
     if (nzchar(path) && cmake_version(path) >= version_required) {
       # Sys.which() returns a named vector, but that plays badly with c() later