update macos builds

nervosys · Mar 12, 2024 · 8e1a484 · 8e1a484
1 parent 507832f
commit 8e1a484
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -99,7 +99,7 @@ if [ ! -d "./external/rpclib/rpclib-${RPCLIB_VERSION}" ]; then
 fi
 
 # Check for local cmake build created by setup.sh.
-if [ -d "./cmake_build" ]; then
+if [ -d './cmake_build' ]; then
     if [ "$(uname)" = 'Darwin' ]; then
         CMAKE="$(greadlink -f cmake_build/bin/cmake)"
     else
@@ -108,7 +108,6 @@ if [ -d "./cmake_build" ]; then
 else
     CMAKE="$(which cmake)"
 fi
-
 CMAKE_C_COMPILER="$CMAKE"
 CMAKE_CXX_COMPILER="$CMAKE"
 

diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -166,7 +166,7 @@ if [ "$(uname)" = 'Darwin' ]; then
     brew update
     # Conditionally install lower CMake version.
     if ( version_less_than_equal_to "$cmake_ver" "$CMAKE_VERSION_MIN" ); then
-        brew install cmake
+        brew install "cmake@${CMAKE_VERSION}"
     else
         echo "Compatible version of CMake already installed: $cmake_ver"
     fi