Merge b87539999f into 49490b10c4

.github/workflows/cmake.yml

@@ -115,10 +115,9 @@ jobs:
         apt install -y gcc make libgl1-mesa-dev libx11-dev libxext-dev
         if [ -x /opt/cmake/bin/cmake ]; then
           echo "Found cached cmake"
-          if [ -n "$(/opt/cmake/bin/cmake --version | grep ${cmake})" ]; then
+          if [ -s "$(/opt/cmake/bin/cmake --version | grep ${cmake})" ]; then
             exit 0
           fi
-          /opt/cmake/bin/cmake --version
           echo "CMake version is mismatched"
           rm -rf /opt/cmake
         fi
@@ -133,32 +132,7 @@ jobs:
         wget https://cmake.org/files/v${short_version}/cmake-${cmake}.tar.gz
         tar -xf cmake-${cmake}.tar.gz
         cd cmake-${cmake}
-        if [ "${cmake}" == "2.8.12.2" ]; then
-          apt -y install patch
-          patch -p1 << 'EOF'
-          --- cmake-2.8.12.2-org/CMakeLists.txt	2014-01-16 17:15:07.000000000 +0000
-          +++ cmake-2.8.12.2-patch/CMakeLists.txt	2025-04-13 10:37:28.359021847 +0000
-          @@ -616 +616 @@
-          -add_subdirectory(Tests)
-          +# add_subdirectory(Tests)
-          --- cmake-2.8.12.2-org/Source/CMakeLists.txt	2014-01-16 17:15:08.000000000 +0000
-          +++ cmake-2.8.12.2-patch/Source/CMakeLists.txt	2025-04-13 10:37:13.584956375 +0000
-          @@ -481,2 +481,2 @@
-          -add_library(CTestLib ${CTEST_SRCS})
-          -target_link_libraries(CTestLib CMakeLib ${CMAKE_CURL_LIBRARIES} ${CMAKE_XMLRPC_LIBRARIES})
-          +# add_library(CTestLib ${CTEST_SRCS})
-          +# target_link_libraries(CTestLib CMakeLib ${CMAKE_CURL_LIBRARIES} ${CMAKE_XMLRPC_LIBRARIES})
-          @@ -562,2 +562,2 @@
-          -add_executable(ctest ctest.cxx)
-          -target_link_libraries(ctest CTestLib)
-          +# add_executable(ctest ctest.cxx)
-          +# target_link_libraries(ctest CTestLib)
-          @@ -583 +583 @@
-          -install(TARGETS cmake ctest cpack DESTINATION bin)
-          +install(TARGETS cmake cpack DESTINATION bin)
-        EOF
-        fi
-        ./configure --prefix=/opt/cmake -- -DCMAKE_USE_OPENSSL=OFF
+        ./configure --prefix=/opt/cmake
         make -j $(nproc) install
 
     - name: Save cmake