Skip to content

Commit 357c663

Browse files
committed
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 <[email protected]>
1 parent b8b8734 commit 357c663

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

CMakeLists.txt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5)
1+
cmake_minimum_required(VERSION 3.16)
22
project(kImageAnnotator LANGUAGES CXX VERSION 0.7.2)
33

44
set(CMAKE_CXX_STANDARD 17)
@@ -79,12 +79,7 @@ target_include_directories(kImageAnnotator
7979
target_link_libraries(kImageAnnotator PUBLIC Qt${QT_MAJOR_VERSION}::Widgets Qt${QT_MAJOR_VERSION}::Svg PRIVATE kColorPicker::kColorPicker)
8080

8181
if (UNIX AND NOT APPLE)
82-
# X11::X11 imported target only available with sufficiently new CMake
83-
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.14.0)
84-
target_link_libraries(kImageAnnotator PRIVATE X11::X11)
85-
else()
86-
target_link_libraries(kImageAnnotator PRIVATE X11)
87-
endif()
82+
target_link_libraries(kImageAnnotator PRIVATE X11::X11)
8883
endif ()
8984

9085
target_compile_definitions(kImageAnnotator PRIVATE KIMAGEANNOTATOR_LIB)

tests/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,7 @@ target_link_libraries(KIMAGEANNOTATOR_STATIC
7575
Qt${QT_MAJOR_VERSION}::Svg)
7676

7777
if (UNIX AND NOT APPLE)
78-
# X11::X11 imported target only available with sufficiently new CMake
79-
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.14.0)
80-
target_link_libraries(KIMAGEANNOTATOR_STATIC X11::X11)
81-
else()
82-
target_link_libraries(KIMAGEANNOTATOR_STATIC X11)
83-
endif()
78+
target_link_libraries(KIMAGEANNOTATOR_STATIC X11::X11)
8479
endif ()
8580

8681
target_compile_definitions(KIMAGEANNOTATOR_STATIC PRIVATE KIMAGEANNOTATOR_LANG_INSTALL_DIR="${KIMAGEANNOTATOR_LANG_INSTALL_DIR}")

0 commit comments

Comments
 (0)