From a4469a5a3b4b21245ca02ce31ff7c6b004ba820e Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 25 Feb 2025 12:08:07 +0100 Subject: [PATCH] Build for Qt6 by default If your Qt5 build broke, pass -DKDChart_QT6=OFF to CMake. --- CMakeLists.txt | 4 ++-- distro/qt5-debian.rules | 2 +- distro/qt5-kdchart.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f719109c..5621126e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ # # -DKDChart_QT6=[true|false] # Build against Qt6 rather than Qt5 -# Default=false (Qt5 will be used even if Qt6 is available) +# Default=true # # -DKDChart_STATIC=[true|false] # Build static versions of the libraries @@ -78,7 +78,7 @@ set(${PROJECT_NAME}_SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR}) include(FeatureSummary) -option(${PROJECT_NAME}_QT6 "Build against Qt 6" OFF) +option(${PROJECT_NAME}_QT6 "Build against Qt 6" ON) option(${PROJECT_NAME}_STATIC "Build statically" OFF) option(${PROJECT_NAME}_TESTS "Build the tests" OFF) option(${PROJECT_NAME}_EXAMPLES "Build the examples" ON) diff --git a/distro/qt5-debian.rules b/distro/qt5-debian.rules index e458b701..a30d4a7f 100644 --- a/distro/qt5-debian.rules +++ b/distro/qt5-debian.rules @@ -1,4 +1,4 @@ #!/usr/bin/make -f -DEB_CMAKE_EXTRA_FLAGS = -DCMAKE_BUILD_TYPE=Release +DEB_CMAKE_EXTRA_FLAGS = -DKDChart_QT6=False -DCMAKE_BUILD_TYPE=Release include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk diff --git a/distro/qt5-kdchart.spec b/distro/qt5-kdchart.spec index 1c96e80e..fd771dc9 100644 --- a/distro/qt5-kdchart.spec +++ b/distro/qt5-kdchart.spec @@ -51,7 +51,7 @@ develop programs using kdchart. %autosetup %build -cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release +cmake . -DCMAKE_INSTALL_PREFIX=/usr -DKDChart_QT6=False -DCMAKE_BUILD_TYPE=Release %__make %{?_smp_mflags} %post -p /sbin/ldconfig