New scheme for enabling cmake modules

+ d/p/CMakeLists.patch: Drop patch
+ d/rules: Activate the modules through -D options to dh_auto_configure

Gbp-Dch: Full

diff --git a/debian/patches/CMakeLists.patch b/debian/patches/CMakeLists.patch
deleted file mode 100644 (file)
index b6234cd..0000000
--- a/debian/patches/CMakeLists.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Description: Enable CMake options
- Enable mpi, loading modules support, joeg, gsl, hdf4, hdf5, pdfm, gif
- glut, fltk, wxWidget, Qt5, JSON, and Python.
-Author: Alastair McKinstry <mckinstry@debian.org>
-Forwarded: not-needed
-Reviewed-By: Rafael Laboissière
-Last-Update: 2020-12-06
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -157,7 +157,7 @@
- endif(WIN32)
- 
- option(enable-double "Enable double precision in MathGL library" ON)
--option(enable-mpi "Enable mpi")
-+option(enable-mpi "Enable mpi" ON)
- option(enable-opengl "Enable OpenGL support" ON)
- option(enable-all-docs "Enable all documentation building")
- #option(enable-doc "Enable documentation building")
-@@ -180,7 +180,7 @@
- 
- option(enable-lgpl "Enable only LGPL part of MathGL")
- option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'")
--option(enable-ltdl "Enable loading modules support")
-+option(enable-ltdl "Enable loading modules support" ON)
- option(enable-doc-site "Enable HTML documentation for website")
- #CMAKE_DEPENDENT_OPTION(enable-doc-site "Enable HTML documentation for website" OFF "NOT enable-all-docs" ON)
- CMAKE_DEPENDENT_OPTION(enable-doc-html "Enable HTML documentation" OFF "NOT enable-all-docs" ON)
-@@ -194,19 +194,19 @@
- 
- CMAKE_DEPENDENT_OPTION(enable-zlib "Enable zlib support" ON "NOT enable-all" ON)
- CMAKE_DEPENDENT_OPTION(enable-png "Enable png support" ON "NOT enable-all" ON)
--CMAKE_DEPENDENT_OPTION(enable-jpeg "Enable jpeg support" OFF "NOT enable-all" ON)
--MGL_DEPENDENT_OPTION(enable-gsl "Enable gsl support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON)
--MGL_DEPENDENT_OPTION(enable-hdf4 "Enable hdf4 support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON)
--MGL_DEPENDENT_OPTION(enable-hdf5 "Enable hdf5 support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON)
--CMAKE_DEPENDENT_OPTION(enable-pdf "Enable pdf support" OFF "NOT enable-all" ON)
--CMAKE_DEPENDENT_OPTION(enable-gif "Enable gif support" OFF "NOT enable-all" ON)
--CMAKE_DEPENDENT_OPTION(enable-glut "Enable glut support" OFF "NOT enable-all-widgets" ON)
--CMAKE_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-all-widgets" ON)
--CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-all-widgets" ON)
-+CMAKE_DEPENDENT_OPTION(enable-jpeg "Enable jpeg support" ON "NOT enable-all" ON)
-+MGL_DEPENDENT_OPTION(enable-gsl "Enable gsl support" ON "NOT enable-lgpl" ON "NOT enable-all" ON)
-+MGL_DEPENDENT_OPTION(enable-hdf4 "Enable hdf4 support" ON "NOT enable-lgpl" ON "NOT enable-all" ON)
-+MGL_DEPENDENT_OPTION(enable-hdf5 "Enable hdf5 support" ON "NOT enable-lgpl" ON "NOT enable-all" ON)
-+CMAKE_DEPENDENT_OPTION(enable-pdf "Enable pdf support" ON "NOT enable-all" ON)
-+CMAKE_DEPENDENT_OPTION(enable-gif "Enable gif support" ON "NOT enable-all" ON)
-+CMAKE_DEPENDENT_OPTION(enable-glut "Enable glut support" ON "NOT enable-all-widgets" ON)
-+CMAKE_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" ON "NOT enable-all-widgets" ON)
-+CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" ON "NOT enable-all-widgets" ON)
- CMAKE_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" OFF "NOT enable-all-widgets" ON)
- CMAKE_DEPENDENT_OPTION(enable-qt4asqt "Set Qt4 as default libmgl-qt" OFF "enable-qt4" OFF)
--CMAKE_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" OFF "NOT enable-all-widgets" ON)
--CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" OFF "enable-qt5" OFF)
-+CMAKE_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" ON "NOT enable-all-widgets" ON)
-+CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF)
- 
- # msvc fwprintf print char* for the specifier of "%s" format
- if(MSVC AND MSVC_VERSION GREATER 1899)
-@@ -243,9 +243,9 @@
- #     endif(NOT enable-opengl)
- endif(enable-qt4 OR enable-qt5)
- 
--CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample (WebKit variant is the default)." ON "QT_ENABLED" OFF)
--CMAKE_DEPENDENT_OPTION(enable-json-sample-we "Enable JSON sample (WebEngine variant)." OFF "enable-json-sample" OFF)
--MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
-+CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample (WebKit variant is the default)." ON "QT_ENABLED" ON)
-+CMAKE_DEPENDENT_OPTION(enable-json-sample-we "Enable JSON sample (WebEngine variant)." ON "enable-json-sample" ON)
-+MGL_DEPENDENT_OPTION(enable-python "Enable python interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
- MGL_DEPENDENT_OPTION(enable-lua "Enable Lua (v.5.1) interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
- MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
- MGL_DEPENDENT_OPTION(enable-octave-install "Octave interface will install for all users" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON)

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644 (file)
index 879efc6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-CMakeLists.patch

diff --git a/debian/rules b/debian/rules
index 253601d10e868611b27f06a168d160cdfa37e736..c4570b98788ba695ba06a668c4ce297357e8a5b6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,8 +25,25 @@ NODOT:=`py3versions -d | sed 's/\.//' | sed 's/python//' `
        dh $@ --buildsystem=cmake
 
 override_dh_auto_configure:
-       dh_auto_configure -- \
-               -DPY3VERSION_DOTTED=$(DOTTED) -DPY3VERSION_NODOT=$(NODOT)
+       dh_auto_configure --                    \
+                -DPY3VERSION_DOTTED=$(DOTTED)  \
+                -DPY3VERSION_NODOT=$(NODOT)    \
+                -Denable-mpi=ON                        \
+                -Denable-ltdl=ON               \
+                -Denable-jpeg=ON               \
+                -Denable-gsl=ON                        \
+                -Denable-hdf4=ON               \
+                -Denable-hdf5=ON               \
+                -Denable-pdf=ON                        \
+                -Denable-gif=ON                        \
+                -Denable-glut=ON               \
+                -Denable-fltk=ON               \
+                -Denable-wx=ON                 \
+                -Denable-qt5=ON                        \
+                -Denable-qt5asqt=ON            \
+                -Denable-json-sample=ON                \
+                -Denable-json-sample-we=ON     \
+                -Denable-python=ON
 
 override_dh_python3:
        dh_numpy3