diff options
| author | Pino Toscano <pino@debian.org> | 2016-07-20 20:38:16 +0200 |
|---|---|---|
| committer | Pino Toscano <pino@debian.org> | 2016-07-20 20:38:16 +0200 |
| commit | 29bd1c6a3da95ade59bb5752963d5b88ffd60964 (patch) | |
| tree | 631fe2aebf3bf9a7f5afb3410f1a8d357f27f726 | |
| parent | bfdded63c2444fe434e4eb4ee19255c8bc266682 (diff) | |
| download | pkg-kde-tools-29bd1c6a3da95ade59bb5752963d5b88ffd60964.tar.gz | |
drop -DCMAKE_USE_RELATIVE_PATHS=ON from CMake flags
it is no more supported in recent versions, and its usage breaks
functionalities (e.g. the QFINDTESTDATA system in Qt 5)
| -rw-r--r-- | datalib/kf5_flags | 1 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | qt-kde-team/1/debian-qt-kde.mk | 5 | ||||
| -rw-r--r-- | qt-kde-team/2/debian-qt-kde.mk | 4 |
4 files changed, 5 insertions, 10 deletions
diff --git a/datalib/kf5_flags b/datalib/kf5_flags index a9aa075..52c529a 100644 --- a/datalib/kf5_flags +++ b/datalib/kf5_flags @@ -1,4 +1,3 @@ -DCMAKE_BUILD_TYPE=Debian --DCMAKE_USE_RELATIVE_PATHS=ON -DCMAKE_INSTALL_SYSCONFDIR=/etc -DKDE_INSTALL_USE_QT_SYS_PATHS=ON diff --git a/debian/changelog b/debian/changelog index 77a4e05..1a03204 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,11 @@ pkg-kde-tools (0.15.22) UNRELEASED; urgency=medium [ Dmitry Shachnev ] * pkgkde-symbolshelper: Add type substitution for long double. + [ Pino Toscano ] + * Drop -DCMAKE_USE_RELATIVE_PATHS=ON from the CMake flags: it is no more + supported in recent versions, and its usage breaks functionalities + (e.g. the QFINDTESTDATA system in Qt 5). + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 23 Jun 2016 22:26:54 +0300 pkg-kde-tools (0.15.21) unstable; urgency=medium diff --git a/qt-kde-team/1/debian-qt-kde.mk b/qt-kde-team/1/debian-qt-kde.mk index cc82765..4428c33 100644 --- a/qt-kde-team/1/debian-qt-kde.mk +++ b/qt-kde-team/1/debian-qt-kde.mk @@ -48,11 +48,6 @@ include $(DEB_PKG_KDE_MAKEFILES)/variables.mk # Add support for pkgkde-symbolshelper by default include $(DEB_PKG_KDE_MAKEFILES)/cdbs/symbolshelper.mk -# Since cmake 2.6.2 or higher is required from now on, enable -# relative paths to get more ccache hits. -# NOTE: might not work with vanilla 2.6.2, only with Debian's one. -DEB_CMAKE_KDE4_FLAGS += -DCMAKE_USE_RELATIVE_PATHS=ON - # Pass standard KDE 4 flags to cmake via appropriate CDBS variable # (DEB_CMAKE_EXTRA_FLAGS) DEB_CMAKE_EXTRA_FLAGS += $(DEB_CMAKE_KDE4_FLAGS) $(DEB_CMAKE_CUSTOM_FLAGS) diff --git a/qt-kde-team/2/debian-qt-kde.mk b/qt-kde-team/2/debian-qt-kde.mk index d976b62..880d9f5 100644 --- a/qt-kde-team/2/debian-qt-kde.mk +++ b/qt-kde-team/2/debian-qt-kde.mk @@ -52,10 +52,6 @@ ifneq (,$(findstring yes, $(dqk_link_with_no_undefined))) endif endif -# Since cmake 2.6.2 or higher is required from now on, enable relative paths to -# get more ccache hits. -$(call set_command_options,dh_auto_configure, += "-u-DCMAKE_USE_RELATIVE_PATHS=ON") - # Run dh_sameversiondep run_dh_sameversiondep: dh_sameversiondep |