[mathgl] 03/04: Disable openmpi support and keep pthread support

Dimitrios Eftaxiopoulos eftaxiop-guest at moszumanska.debian.org
Sat Feb 22 16:27:17 UTC 2014 

This is an automated email from the git hooks/post-receive script.

eftaxiop-guest pushed a commit to branch master
in repository mathgl.

commit e033e096a6b11b9655a76d96d07b4c8327c04514
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Sat Feb 22 15:07:21 2014 +0200

    Disable openmpi support and keep pthread support
---
 CMakeLists.txt                                     |  6 ++---
 debian/control                                     | 26 +++++++++++-----------
 ...gl-mpi7.1.0.install => libmgl-mpi7.2.0.install} |  0
 debian/patches/CMakeLists.txt.patch                | 21 +++++++++++------
 4 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2294903..74c87b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,14 +60,14 @@ set(MGL_LIB_INSTALL_DIR "lib" CACHE STRING "Set library install directory")
 
 option(enable-double "Enable double precision in MathGL library" ON)
 option(enable-simple "Slightly increase drawing speed but disable mglDataA class")
-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")
 option(enable-all "Enable all core features")
 option(enable-all-widgets "Enable all Widgets")
 option(enable-all-swig "Enable all SWIG based interfaces")
-option(enable-pthread "Enable POSIX threads support" OFF)
+option(enable-pthread "Enable POSIX threads support" ON)
 option(enable-openmp "Enable OpenMP support" OFF)
 option(enable-lgpl "Enable only LGPL part of MathGL")
 option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'")
@@ -94,7 +94,7 @@ MGL_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-lgpl" ON "
 CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-lgpl" OFF)
 MGL_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" ON "NOT enable-lgpl" ON "NOT enable-all-widgets" ON)
 MGL_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON)
-CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" OFF "enable-qt5" OFF)
+CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF)
 MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "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)
diff --git a/debian/control b/debian/control
index eaef9d1..eeb5bb9 100644
--- a/debian/control
+++ b/debian/control
@@ -70,19 +70,19 @@ Description: library for scientific graphs (main runtime library)
  .
  This package contains the shared object files.
 
-# Package: libmgl-mpi7.1.0
-# Architecture: any
-# Section: libs
-# Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
-# Description: library for scientific graphs (mpi enhanced runtime library)
-#  A free cross-platform library of fast C++ routines for plotting data in up
-#  to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF
-#  files. There are simple window interfaces based on GLUT, FLTK and/or Qt.
-#  MathGL can also be used in the console. There are interfaces to a set of
-#  languages, such as, C, Fortran, Pascal, Forth, Python, Octave.
-#  .
-#  This package contains the, parallel interface enhanced, shared object 
-#  files.
+Package: libmgl-mpi7.2.0
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
+Description: library for scientific graphs (mpi enhanced runtime library)
+ A free cross-platform library of fast C++ routines for plotting data in up
+ to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF
+ files. There are simple window interfaces based on GLUT, FLTK and/or Qt.
+ MathGL can also be used in the console. There are interfaces to a set of
+ languages, such as, C, Fortran, Pascal, Forth, Python, Octave.
+ .
+ This package contains the, parallel interface enhanced, shared object 
+ files.
 
 # Package: libmgl-wnd7.1.0
 # Architecture: any
diff --git a/debian/libmgl-mpi7.1.0.install b/debian/libmgl-mpi7.2.0.install
similarity index 100%
rename from debian/libmgl-mpi7.1.0.install
rename to debian/libmgl-mpi7.2.0.install
diff --git a/debian/patches/CMakeLists.txt.patch b/debian/patches/CMakeLists.txt.patch
index ea33049..268bb38 100644
--- a/debian/patches/CMakeLists.txt.patch
+++ b/debian/patches/CMakeLists.txt.patch
@@ -1,23 +1,30 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -68,7 +68,7 @@
+@@ -60,15 +60,15 @@
+ 
+ option(enable-double "Enable double precision in MathGL library" ON)
+ option(enable-simple "Slightly increase drawing speed but disable mglDataA class")
+-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")
+ option(enable-all "Enable all core features")
  option(enable-all-widgets "Enable all Widgets")
  option(enable-all-swig "Enable all SWIG based interfaces")
- option(enable-pthread "Enable POSIX threads support" OFF)
+-option(enable-pthread "Enable POSIX threads support" OFF)
 -option(enable-openmp "Enable OpenMP support" ON)
++option(enable-pthread "Enable POSIX threads support" ON)
 +option(enable-openmp "Enable OpenMP support" OFF)
  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")
-@@ -92,9 +92,9 @@
+@@ -92,7 +92,7 @@
  MGL_DEPENDENT_OPTION(enable-glut "Enable glut support" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON)
  MGL_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON)
  CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-lgpl" OFF)
 -MGL_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON)
 +MGL_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" ON "NOT enable-lgpl" ON "NOT enable-all-widgets" ON)
  MGL_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON)
--CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF)
-+CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" OFF "enable-qt5" OFF)
+ CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF)
  MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "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)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathgl.git

More information about the debian-science-commits mailing list