From a9abac08165581959590a43a2853162ca44d7d91 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 15 Mar 2024 11:17:30 +0900 Subject: [PATCH] Use centralized cmake version Signed-off-by: Michele Calgaro --- CMakeL10n.txt | 6 +++++- CMakeLists.txt | 12 ++++++------ template/commonCMakeLists.txt | 7 ++++++- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/CMakeL10n.txt b/CMakeL10n.txt index ff5d79292af..d21ab815c3a 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,7 +9,11 @@ # ################################################# -cmake_minimum_required( VERSION 3.5 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# diff --git a/CMakeLists.txt b/CMakeLists.txt index fa1efdeac11..e0f052fb4f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,12 @@ # ################################################# -cmake_minimum_required( VERSION 3.5 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) ##### general package setup ##################### @@ -27,11 +32,6 @@ include( FindPkgConfig ) # required for find_package( TDE ) include( TDEMacros ) -##### set version number ######################## - -tde_set_project_version( ) - - ##### find required stuff ####################### find_package( TDE ) diff --git a/template/commonCMakeLists.txt b/template/commonCMakeLists.txt index 1d4214efddd..259c326bf87 100644 --- a/template/commonCMakeLists.txt +++ b/template/commonCMakeLists.txt @@ -12,7 +12,12 @@ # ################################################# -cmake_minimum_required( VERSION 3.5 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) ##### general package setup #####################