From 7ba49749bea9c1c825f9e184413e3cf717dc76b2 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 17 Jul 2025 23:56:15 +0200 Subject: [PATCH] Raise minimum CMake version, use GNUInstallDirs --- CMakeLists.txt | 11 ++++++----- qcustomplot.spec | 5 ++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index db8406f..51e9a02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,6 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.5) project(qcustomplot) +include(GNUInstallDirs) set(LIB_VER "" CACHE STRING "Library version") set(QT_VER "6" CACHE STRING "Target Qt version") @@ -23,12 +24,12 @@ endif() target_link_libraries(qcustomplot Qt${QT_VER}::Core Qt${QT_VER}::Gui Qt${QT_VER}::Widgets Qt${QT_VER}::PrintSupport) install(TARGETS qcustomplot - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) # Headers install(FILES qcustomplot.h - DESTINATION include + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) diff --git a/qcustomplot.spec b/qcustomplot.spec index d6e6a57..2aaa8c8 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -12,7 +12,7 @@ Name: qcustomplot Version: 2.1.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Qt widget for plotting and data visualization License: GPL-3.0-or-later @@ -171,6 +171,9 @@ EOF %changelog +* Thu Jul 17 2025 Sandro Mani - 2.1.1-12 +- Raise minimum CMake version, use GNUInstallDirs + * Sat Jan 18 2025 Fedora Release Engineering - 2.1.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild