Source: https://github.com/ksnip/kImageAnnotator/pull/344 From 357c66330ac99fbfd3a1aa884a318750e7774237 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Thu, 23 Oct 2025 10:28:26 +0200 Subject: [PATCH] Raise minimum CMake version to 3.16 and cleanup related conditionals CMake 3.31 warns about compat. for <3.10 being removed in the future. Qt6 CMake modules already require 3.16 though, and it allows to clean up existing CMAKE_VERSION conditionals a bit. CMake 3.16 was released in 2019. Signed-off-by: Andreas Sturmlechner --- CMakeLists.txt | 9 ++------- tests/CMakeLists.txt | 7 +------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 24dd825..360b555 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.16) project(kImageAnnotator LANGUAGES CXX VERSION 0.7.1) set(CMAKE_CXX_STANDARD 17) @@ -79,12 +79,7 @@ target_include_directories(kImageAnnotator target_link_libraries(kImageAnnotator PUBLIC Qt${QT_MAJOR_VERSION}::Widgets Qt${QT_MAJOR_VERSION}::Svg PRIVATE kColorPicker::kColorPicker) if (UNIX AND NOT APPLE) - # X11::X11 imported target only available with sufficiently new CMake - if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.14.0) - target_link_libraries(kImageAnnotator PRIVATE X11::X11) - else() - target_link_libraries(kImageAnnotator PRIVATE X11) - endif() + target_link_libraries(kImageAnnotator PRIVATE X11::X11) endif () target_compile_definitions(kImageAnnotator PRIVATE KIMAGEANNOTATOR_LIB) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index fe2d1da..4dcddb1 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -75,12 +75,7 @@ target_link_libraries(KIMAGEANNOTATOR_STATIC Qt${QT_MAJOR_VERSION}::Svg) if (UNIX AND NOT APPLE) - # X11::X11 imported target only available with sufficiently new CMake - if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.14.0) - target_link_libraries(KIMAGEANNOTATOR_STATIC X11::X11) - else() - target_link_libraries(KIMAGEANNOTATOR_STATIC X11) - endif() + target_link_libraries(KIMAGEANNOTATOR_STATIC X11::X11) endif () target_compile_definitions(KIMAGEANNOTATOR_STATIC PRIVATE KIMAGEANNOTATOR_LANG_INSTALL_DIR="${KIMAGEANNOTATOR_LANG_INSTALL_DIR}") -- 2.51.1