From 142e536230040523bcf1f3de903df52f91c76d79 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Thu, 25 Aug 2022 08:43:09 -0600 Subject: [PATCH] Change cmake_minimum_required() to upper bound TRIBITS_CMAKE_MINIMUM_REQUIRED (#522) This was changed from the open-ended ${CMAKE_VERSION}. This way, we allow CMake to use a more current set of policies while not writting future futures of CMake a blank check. This change was made based on feedback from @KyleFromKitware from the post-merge review of #523. NOTE: I manaully tested this with a configure of Trilinos and it produded: cmake_minimum_required(VERSION 3.3...3.17.0) --- tribits/core/installation/TribitsPackageConfigTemplate.cmake.in | 2 +- tribits/core/installation/TribitsProjectConfigTemplate.cmake.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in b/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in index abfb2f436..465648d63 100644 --- a/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in +++ b/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in @@ -52,7 +52,7 @@ if(CMAKE_VERSION VERSION_LESS 3.3) set(${PDOLLAR}{CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) return() endif() -cmake_minimum_required(VERSION 3.3...${CMAKE_VERSION}) +cmake_minimum_required(VERSION 3.3...${TRIBITS_CMAKE_MINIMUM_REQUIRED}) ## --------------------------------------------------------------------------- ## Compilers used by ${PROJECT_NAME}/${PACKAGE_NAME} build diff --git a/tribits/core/installation/TribitsProjectConfigTemplate.cmake.in b/tribits/core/installation/TribitsProjectConfigTemplate.cmake.in index cdd3ee08c..67eb685ed 100644 --- a/tribits/core/installation/TribitsProjectConfigTemplate.cmake.in +++ b/tribits/core/installation/TribitsProjectConfigTemplate.cmake.in @@ -53,7 +53,7 @@ if(CMAKE_VERSION VERSION_LESS 3.3) set(${PDOLLAR}{CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) return() endif() -cmake_minimum_required(VERSION 3.3...${CMAKE_VERSION}) +cmake_minimum_required(VERSION 3.3...${TRIBITS_CMAKE_MINIMUM_REQUIRED}) ## --------------------------------------------------------------------------- ## Compilers used by ${PROJECT_NAME} build