From d7af99e0675b5729346cdd6bc1640c3b66899485 Mon Sep 17 00:00:00 2001 From: sciome-bot Date: Tue, 12 Nov 2024 17:41:57 -0500 Subject: [PATCH] Add an extra check for linux when installing cmake --- configure | 13 ++++++++----- configure.ac | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 9eb77a1..dde606b 100755 --- a/configure +++ b/configure @@ -3495,11 +3495,14 @@ fi if test x"${have_cmake}" == x"no"; then - . src/scripts/cmake_install.sh - if test -z "${CMAKE_BIN}"; then - ## also error to end configure here - as_fn_error $? "Could not find 'cmake'." "$LINENO" 5 - fi + + if test x"${OS_FLAG}" == x"Linux"; then + . src/scripts/cmake_install.sh + if test -z "${CMAKE_BIN}"; then + ## also error to end configure here + as_fn_error $? "Could not find 'cmake'." "$LINENO" 5 + fi + fi fi ## 'uname -m' on M1 give x86_64 which is ... not helping machine=`"${R_HOME}/bin/Rscript" -e 'cat(Sys.info()["machine"])'` diff --git a/configure.ac b/configure.ac index e486c60..4bf1608 100644 --- a/configure.ac +++ b/configure.ac @@ -78,11 +78,14 @@ if test x"${need_to_build}" != x"no"; then AC_PATH_PROG(have_cmake, cmake, no) if test x"${have_cmake}" == x"no"; then - . src/scripts/cmake_install.sh - if test -z "${CMAKE_BIN}"; then - ## also error to end configure here - AC_MSG_ERROR([Could not find 'cmake'.]) - fi + + if test x"${OS_FLAG}" == x"Linux"; then + . src/scripts/cmake_install.sh + if test -z "${CMAKE_BIN}"; then + ## also error to end configure here + AC_MSG_ERROR([Could not find 'cmake'.]) + fi + fi fi ## 'uname -m' on M1 give x86_64 which is ... not helping machine=`"${R_HOME}/bin/Rscript" -e 'cat(Sys.info()[["machine"]])'`