From 61f83f1471dc6c855930195172131f6531b0f2a1 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 7 May 2024 19:02:31 +0900 Subject: [PATCH] DEB piklab: switch to cmake building system Signed-off-by: Michele Calgaro (cherry picked from commit 81ae412a67476f0c72cdddd2b26385304f26be18) --- .../development/piklab/debian/control | 4 ++-- .../development/piklab/debian/install | 2 -- .../development/piklab/debian/rules | 21 +++++++++++-------- .../development/piklab/debian/control | 4 ++-- .../development/piklab/debian/install | 2 -- .../development/piklab/debian/rules | 21 +++++++++++-------- 6 files changed, 28 insertions(+), 26 deletions(-) diff --git a/debian/_base/applications/development/piklab/debian/control b/debian/_base/applications/development/piklab/debian/control index 733219472..5ae69eb30 100644 --- a/debian/_base/applications/development/piklab/debian/control +++ b/debian/_base/applications/development/piklab/debian/control @@ -2,8 +2,8 @@ Source: piklab-trinity Section: electronics Priority: extra Maintainer: TDE Debian Team -Build-Depends: cdbs, debhelper (>= 10~), autotools-dev, quilt, chrpath, - libusb-dev, tdelibs14-trinity-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, + libusb-dev, libreadline-dev | libreadline6-dev | libreadline5-dev Standards-Version: 3.8.4 Homepage: http://piklab.sourceforge.net/ diff --git a/debian/_base/applications/development/piklab/debian/install b/debian/_base/applications/development/piklab/debian/install index 4b76727ec..36f006452 100644 --- a/debian/_base/applications/development/piklab/debian/install +++ b/debian/_base/applications/development/piklab/debian/install @@ -1,3 +1 @@ debian/*.xpm opt/trinity/share/pixmaps/ -#debian/*.desktop usr/share/applications/ -#debian/overrides/piklab usr/share/lintian/overrides/ diff --git a/debian/_base/applications/development/piklab/debian/rules b/debian/_base/applications/development/piklab/debian/rules index 5b220ac67..a6797f19a 100755 --- a/debian/_base/applications/development/piklab/debian/rules +++ b/debian/_base/applications/development/piklab/debian/rules @@ -1,14 +1,17 @@ #!/usr/bin/make -f -# Currently is not possible to build piklab with --enable-final -DEB_BUILD_OPTIONS += noopt - include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/applications/development/piklab/debian/control b/ubuntu/_base/applications/development/piklab/debian/control index 502bc13bd..e67fd589a 100644 --- a/ubuntu/_base/applications/development/piklab/debian/control +++ b/ubuntu/_base/applications/development/piklab/debian/control @@ -2,8 +2,8 @@ Source: piklab-trinity Section: electronics Priority: extra Maintainer: TDE Debian Team -Build-Depends: cdbs, debhelper (>= 10~), autotools-dev, quilt, chrpath, - libusb-dev, tdelibs14-trinity-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, + libusb-dev, libreadline-dev | libreadline6-dev | libreadline5-dev Standards-Version: 3.8.4 Homepage: http://piklab.sourceforge.net/ diff --git a/ubuntu/_base/applications/development/piklab/debian/install b/ubuntu/_base/applications/development/piklab/debian/install index 4b76727ec..36f006452 100644 --- a/ubuntu/_base/applications/development/piklab/debian/install +++ b/ubuntu/_base/applications/development/piklab/debian/install @@ -1,3 +1 @@ debian/*.xpm opt/trinity/share/pixmaps/ -#debian/*.desktop usr/share/applications/ -#debian/overrides/piklab usr/share/lintian/overrides/ diff --git a/ubuntu/_base/applications/development/piklab/debian/rules b/ubuntu/_base/applications/development/piklab/debian/rules index 5b220ac67..a6797f19a 100755 --- a/ubuntu/_base/applications/development/piklab/debian/rules +++ b/ubuntu/_base/applications/development/piklab/debian/rules @@ -1,14 +1,17 @@ #!/usr/bin/make -f -# Currently is not possible to build piklab with --enable-final -DEB_BUILD_OPTIONS += noopt - include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON"