Skip to content

Commit

Permalink
Add an extra check for linux when installing cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
sciome-bot committed Nov 12, 2024
1 parent c713069 commit d7af99e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
13 changes: 8 additions & 5 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -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"])'`
Expand Down
13 changes: 8 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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"]])'`
Expand Down

0 comments on commit d7af99e

Please sign in to comment.