diff options
Diffstat (limited to 'src/third_party/wiredtiger/test/evergreen/find_cmake.sh')
| -rwxr-xr-x | src/third_party/wiredtiger/test/evergreen/find_cmake.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/third_party/wiredtiger/test/evergreen/find_cmake.sh b/src/third_party/wiredtiger/test/evergreen/find_cmake.sh index 17d40b36a5c..312019cb933 100755 --- a/src/third_party/wiredtiger/test/evergreen/find_cmake.sh +++ b/src/third_party/wiredtiger/test/evergreen/find_cmake.sh @@ -12,7 +12,7 @@ CMAKE_VERSION=$CMAKE_MAJOR_VER.$CMAKE_MINOR_VER.$CMAKE_PATCH_VER # https://github.com/mongodb/mongo-c-driver/blob/master/.evergreen/find-cmake.sh find_cmake () { - if [ ! -z "$CMAKE" ]; then + if [ -n "$CMAKE" ]; then return 0 elif [ -f "/Applications/CMake.app/Contents/bin/cmake" ]; then CMAKE="/Applications/CMake.app/Contents/bin/cmake" @@ -20,6 +20,10 @@ find_cmake () elif [ -f "/opt/cmake/bin/cmake" ]; then CMAKE="/opt/cmake/bin/cmake" CTEST="/opt/cmake/bin/ctest" + # Newer package system can be kept separate from the older "cmake". + elif [ -f "/usr/bin/cmake3" ]; then + CMAKE=/usr/bin/cmake3 + CTEST=/usr/bin/ctest3 elif command -v cmake 2>/dev/null; then CMAKE=cmake CTEST=ctest |