Also update aws-lc-fips-sys CMakeLists.txt

.github/docker_images/cmake_build_versions/aws_lc_rs_build.sh

@@ -6,6 +6,11 @@
 set -ex -o pipefail
 
 echo "Building with CMake Version: $(cmake --version)"
+FIPS_BUILD=1
+if cmake --version | grep -q " 4."; then
+    echo "CMake version is 4.x, skipping FIPS build"
+    FIPS_BUILD=0
+fi
 
 . "${HOME}/.cargo/env"
 SRC_DIR="${SRC_DIR:-/aws_lc_rs}"
@@ -15,11 +20,16 @@ pushd "${SRC_DIR}"
 cargo clean
 cargo test -p aws-lc-rs --features=unstable
 cargo clean
-cargo test -p aws-lc-rs --features=unstable,fips
-cargo clean
+if  [ ${FIPS_BUILD} -eq 1 ]; then
+  cargo test -p aws-lc-rs --features=unstable,fips
+  cargo clean
+fi
 cargo test -p aws-lc-rs --release --features=unstable
 cargo clean
-cargo test -p aws-lc-rs --release --features=unstable,fips
+if  [ ${FIPS_BUILD} -eq 1 ]; then
+  cargo test -p aws-lc-rs --release --features=unstable,fips
+  cargo clean
+fi
 
 
 popd # ${BUILD_DIR}

aws-lc-fips-sys/CMakeLists.txt

@@ -1,7 +1,14 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0 OR ISC
 
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5...3.31)
+
+if(CMAKE_VERSION VERSION_GREATER "3.14")
+# https://cmake.org/cmake/help/latest/policy/CMP0091.html
+# In CMake 3.14 and below, MSVC runtime library selection flags are added to the default CMAKE_<LANG>_FLAGS_<CONFIG>
+# cache entries by CMake automatically.
+cmake_policy(SET CMP0091 OLD)
+endif()
 
 project(AWS_LC_RUST NONE)
 enable_language(C)