update setup_cmake* scripts to verify the versions installed

Author: dbarker

ci/setup_cmake.ps1

@@ -12,4 +12,37 @@ choco uninstall cmake cmake.install -y --remove-dependencies --skip-autouninstal
 Write-Host "Installing CMake version $CMAKE_VERSION ..."
 choco install cmake --version=$CMAKE_VERSION --allow-downgrade -y --force --no-progress
 
-cmake --version
+function Get-Version {
+    param (
+        [string]$output
+    )
+    if ($output -match '(\d+\.\d+\.\d+)') {
+        return $matches[1]
+    }
+    return $null
+}
+
+$cmakeOutput = & cmake --version | Select-Object -First 1
+$ctestOutput = & ctest --version | Select-Object -First 1
+$cpackOutput = & cpack --version | Select-Object -First 1
+
+$cmakeVersion = Get-Version $cmakeOutput
+$ctestVersion = Get-Version $ctestOutput
+$cpackVersion = Get-Version $cpackOutput
+
+Write-Host "cmake version $cmakeVersion detected"
+Write-Host "ctest version $ctestVersion detected"
+Write-Host "cpack version $cpackVersion detected"
+
+if ($cmakeVersion -ne $CMAKE_VERSION) {
+    Write-Error "CMake version mismatch: expected $CMAKE_VERSION, installed $cmakeVersion"
+    exit 1
+}
+if ($ctestVersion -ne $CMAKE_VERSION) {
+    Write-Error "CTest version mismatch: expected $CMAKE_VERSION, installed $ctestVersion"
+    exit 1
+}
+if ($cpackVersion -ne $CMAKE_VERSION) {
+    Write-Error "CPack version mismatch: expected $CMAKE_VERSION, installed $cpackVersion"
+    exit 1
+}

ci/setup_cmake.sh

@@ -6,27 +6,43 @@
 set -e
 
 CMAKE_VERSION=${CMAKE_VERSION:-3.31.6}
-CMAKE_DIR="cmake-$CMAKE_VERSION-linux-x86_64"
-CMAKE_TAR="$CMAKE_DIR.tar.gz"
-CMAKE_URL="https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/$CMAKE_TAR"
+CMAKE_DIR="cmake-${CMAKE_VERSION}-linux-x86_64"
+CMAKE_TAR="${CMAKE_DIR}.tar.gz"
+CMAKE_URL="https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_TAR}"
 
-echo "Installing CMake version: $CMAKE_VERSION"
+INSTALL_DIR="/opt/cmake"
+
+echo "Installing CMake version: ${CMAKE_VERSION}..."
 
 apt-get update && apt-get remove --purge -y cmake || true
 
 apt-get install -y wget tar
 
-wget "$CMAKE_URL"
-
-tar -xzf "$CMAKE_TAR"
+wget "${CMAKE_URL}"
 
-mkdir -p /opt/cmake
-mv "$CMAKE_DIR" /opt/cmake/cmake
+mkdir -p "${INSTALL_DIR}"
+tar --strip-components=1 -xzf "${CMAKE_TAR}" -C "${INSTALL_DIR}"
 
-for file in /opt/cmake/cmake/bin/*; do
-    ln -sf "$file" "/usr/local/bin/$(basename "$file")"
+for executable in "${INSTALL_DIR}/bin/"*; do
+    exe_name=$(basename "$executable")
+    ln -sf "$executable" "/usr/local/bin/$exe_name"
 done
 
-rm -f "$CMAKE_TAR"
+rm -f "${CMAKE_TAR}"
+
+echo "Verifying installed versions..."
+
+for executable in cmake ctest cpack; do
+    if command -v "$executable" >/dev/null 2>&1; then
+        ACTUAL_VERSION=$("$executable" --version | grep -Eo '[0-9]+(\.[0-9]+)*' | head -n 1)
+        echo "$executable version: $ACTUAL_VERSION detected"
+        if [ "$ACTUAL_VERSION" != "$CMAKE_VERSION" ]; then
+            echo "E: $executable version mismatch. Expected $CMAKE_VERSION, found '$ACTUAL_VERSION'" >&2
+            exit 1
+        fi
+    else
+        echo "E: $executable is not installed or not in PATH." >&2
+        exit 1
+    fi
+done
 
-cmake --version

ci/setup_cmake_macos.sh

@@ -11,30 +11,41 @@ CMAKE_TAR="${CMAKE_PKG}.tar.gz"
 CMAKE_URL="https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_TAR}"
 
 INSTALL_DIR="/opt/cmake"
-BIN_DIR="${INSTALL_DIR}/cmake/CMake.app/Contents/bin"
 
 echo "Installing CMake version ${CMAKE_VERSION}..."
 
-if brew list cmake >/dev/null 2>&1; then
-  echo "Removing existing Homebrew-installed CMake..."
-  brew uninstall cmake
-fi
+brew uninstall cmake || true
 
 if ! command -v wget >/dev/null 2>&1; then
-  echo "wget not found. Installing wget via Homebrew..."
+  echo "Installing wget..."
   brew install wget
 fi
 
 wget -q "${CMAKE_URL}"
-tar -xzf "${CMAKE_TAR}"
-
 sudo mkdir -p "${INSTALL_DIR}"
-sudo mv "${CMAKE_PKG}" "${INSTALL_DIR}/cmake"
+sudo tar --strip-components=1 -xzf "${CMAKE_TAR}" -C "${INSTALL_DIR}"
 
-for file in "${BIN_DIR}"/*; do
-  sudo ln -sf "${file}" "/usr/local/bin/$(basename "${file}")"
+BINARY_DIR="${INSTALL_DIR}/CMake.app/Contents/bin"
+
+for executable in "${BINARY_DIR}/"*; do
+    exe_name=$(basename "$executable")
+    sudo ln -sf "$executable" "/usr/local/bin/$exe_name"
 done
 
 rm -f "${CMAKE_TAR}"
 
-cmake --version
+echo "Verifying installed versions..."
+
+for executable in cmake ctest cpack; do
+    if command -v "$executable" >/dev/null 2>&1; then
+        ACTUAL_VERSION=$("$executable" --version | grep -Eo '[0-9]+(\.[0-9]+)*' | head -n 1)
+        echo "$executable version: $ACTUAL_VERSION detected"
+        if [ "$ACTUAL_VERSION" != "$CMAKE_VERSION" ]; then
+            echo "E: $executable version mismatch. Expected $CMAKE_VERSION, found '$ACTUAL_VERSION'" >&2
+            exit 1
+        fi
+    else
+        echo "E: $executable is not installed or not in PATH." >&2
+        exit 1
+    fi
+done