Skip to content

Raise minimum CMake version to 3.16 and cleanup related conditionals #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Raise minimum CMake version to 3.16 and cleanup related conditionals #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.16)
project(kImageAnnotator LANGUAGES CXX VERSION 0.7.2)

set(CMAKE_CXX_STANDARD 17)
Expand Down Expand Up @@ -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)
Expand Down
7 changes: 1 addition & 6 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down