From d8c59d0fb5c6984e5fe6b1f33c4ca060ac9f8415 Mon Sep 17 00:00:00 2001 From: "Baker, Grant" Date: Mon, 24 Aug 2026 13:39:10 -0700 Subject: [PATCH 1/2] Update cmake version as required by gtest in Dockerfile and update cmake_minimum_required --- CMakeLists.txt | 2 +- Dockerfile | 8 ++++---- cmake/gtest.cmake.in | 2 +- src/CMakeLists.txt | 2 +- util/BigMPI/CMakeLists.txt | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b0331d8..2c8987b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.12) +cmake_minimum_required(VERSION 3.15) ################################################################################ # Define our package information. diff --git a/Dockerfile b/Dockerfile index f1269d99..65c0f28f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,10 +34,10 @@ RUN apt-get update && DEBIAN_FRONTEND=nonitneractive apt-get install -y mpich RUN apt-get update && apt-get install -y openssh-client RUN apt-get update && apt-get install -y openssh-server -# Fetch and install CMake 3.15 as required by Intel-QS build process. -WORKDIR swpkgs/cmake3.15 -RUN wget "https://github.com/Kitware/CMake/releases/download/v3.15.2/cmake-3.15.2-Linux-x86_64.tar.gz" -RUN tar -xzf cmake-3.15.2-Linux-x86_64.tar.gz -C /usr/local/ --strip-components=1 +# Fetch and install CMake 4.4.2 +WORKDIR swpkgs/cmake4.4.2 +RUN wget "https://github.com/Kitware/CMake/releases/download/v4.4.2/cmake-4.4.2-linux-x86_64.tar.gz" +RUN tar -xzf cmake-4.4.2-linux-x86_64.tar.gz -C /usr/local/ --strip-components=1 # Fetch and install the Intel MKL libraries required for building the Intel-QS simulator. WORKDIR swpkgs/mkl diff --git a/cmake/gtest.cmake.in b/cmake/gtest.cmake.in index 37b622bf..a93f5955 100644 --- a/cmake/gtest.cmake.in +++ b/cmake/gtest.cmake.in @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.2) +cmake_minimum_required(VERSION 3.15) project(googletest-download NONE) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ffef0348..ed3b48a1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,7 +4,7 @@ if (IqsNoise) # Download and unpack eigen library at configure time. - cmake_minimum_required(VERSION 3.12.0) + cmake_minimum_required(VERSION 3.15) include(ExternalProject) ExternalProject_Add(deps-eigen GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git diff --git a/util/BigMPI/CMakeLists.txt b/util/BigMPI/CMakeLists.txt index 5143aa86..bba99f25 100644 --- a/util/BigMPI/CMakeLists.txt +++ b/util/BigMPI/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR) +cmake_minimum_required(VERSION 3.15 FATAL_ERROR) set(PACKAGE_NAME BigMPI) find_package(MPI) From 05bf12bd66b4ab1e6a9568df4fe901d576dec22c Mon Sep 17 00:00:00 2001 From: "Baker, Grant" Date: Tue, 25 Aug 2026 10:30:04 -0700 Subject: [PATCH 2/2] Update cmake used in docker build to earlier version as requested --- CMakeLists.txt | 2 +- Dockerfile | 8 ++++---- cmake/gtest.cmake.in | 2 +- src/CMakeLists.txt | 2 +- util/BigMPI/CMakeLists.txt | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c8987b7..f5202195 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.16) ################################################################################ # Define our package information. diff --git a/Dockerfile b/Dockerfile index 65c0f28f..62e290d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,10 +34,10 @@ RUN apt-get update && DEBIAN_FRONTEND=nonitneractive apt-get install -y mpich RUN apt-get update && apt-get install -y openssh-client RUN apt-get update && apt-get install -y openssh-server -# Fetch and install CMake 4.4.2 -WORKDIR swpkgs/cmake4.4.2 -RUN wget "https://github.com/Kitware/CMake/releases/download/v4.4.2/cmake-4.4.2-linux-x86_64.tar.gz" -RUN tar -xzf cmake-4.4.2-linux-x86_64.tar.gz -C /usr/local/ --strip-components=1 +# Fetch and install CMake 3.16 +WORKDIR swpkgs/cmake3.16.0 +RUN wget "https://github.com/Kitware/CMake/releases/download/v3.16.0/cmake-3.16.0-Linux-x86_64.tar.gz" +RUN tar -xzf cmake-3.16.0-Linux-x86_64.tar.gz -C /usr/local/ --strip-components=1 # Fetch and install the Intel MKL libraries required for building the Intel-QS simulator. WORKDIR swpkgs/mkl diff --git a/cmake/gtest.cmake.in b/cmake/gtest.cmake.in index a93f5955..40882a47 100644 --- a/cmake/gtest.cmake.in +++ b/cmake/gtest.cmake.in @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.16) project(googletest-download NONE) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ed3b48a1..ea8c2523 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,7 +4,7 @@ if (IqsNoise) # Download and unpack eigen library at configure time. - cmake_minimum_required(VERSION 3.15) + cmake_minimum_required(VERSION 3.16) include(ExternalProject) ExternalProject_Add(deps-eigen GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git diff --git a/util/BigMPI/CMakeLists.txt b/util/BigMPI/CMakeLists.txt index bba99f25..58c8765d 100644 --- a/util/BigMPI/CMakeLists.txt +++ b/util/BigMPI/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.16 FATAL_ERROR) set(PACKAGE_NAME BigMPI) find_package(MPI)