Just a build

diff --git a/CMakeLists.txt b/CMakeLists.txt
index df67e618be1e9f3d7cd2cc9b08b26c304992a311..28894c63a9f51cbd6414a89f3825abb5c80ed60d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,9 +118,9 @@ 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-rvalue "Enable move constructor support (need C++11)" OFF)
-option(enable-pthread "Enable POSIX threads support" OFF)
+option(enable-pthread "Enable POSIX threads support" ON)
 option(enable-pthr-widget "Enable POSIX threads for widgets" ON)
-option(enable-openmp "Enable OpenMP support" ON)
+option(enable-openmp "Enable OpenMP support" OFF)
 
 if(enable-pthread AND enable-openmp)
        message(SEND_ERROR "You can't enable POSIX threads and OpenMP at the same time!")
@@ -141,19 +141,19 @@ CMAKE_DEPENDENT_OPTION(enable-mgltex "Enable installation of mgltex package (MGL
 
 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)
@@ -178,9 +178,9 @@ if(enable-qt4 OR enable-qt5)
 endif(enable-qt4 OR enable-qt5)
 
 CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "QT_ENABLED" OFF)
-MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" 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 "Enable octave interface" ON "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)
 
 include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include)
@@ -411,7 +411,7 @@ if(enable-hdf5)
                endif(NOT HDF5_FOUND)
        endif(NOT HDF5_FOUND)
        set(MGL_DEP_LIBS ${HDF5_LIBRARIES} ${HDF5_C_SHARED_LIBRARY} ${MGL_DEP_LIBS})
-       include_directories(${HDF5_INCLUDE_DIR})
+       include_directories(${HDF5_INCLUDE_DIRS})
 else(enable-hdf5)
        set(MGL_HAVE_HDF5 0)
 endif(enable-hdf5)

diff --git a/debian/control b/debian/control
index 74a0db6087f0defcb84740421b2c85a4d3ff848d..a7d273e3fea15a5eb5497fb3bb569a9ab75bca71 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -73,21 +73,21 @@ Description: library for scientific graphs (main runtime library)
  .
  This package contains the shared object files.
 
-Package: libmgl-mpi7.4.1
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
-Replaces: libmgl-mpi7.0.0, libmgl-mpi7.1.0, libmgl-mpi7.2.0, libmgl-mpi7.4.0
-Conflicts: libmgl-mpi7.0.0, libmgl-mpi7.1.0, libmgl-mpi7.2.0, libmgl-mpi7.4.0
-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.4.1
+# Architecture: any
+# Section: libs
+# Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
+# Replaces: libmgl-mpi7.0.0, libmgl-mpi7.1.0, libmgl-mpi7.2.0, libmgl-mpi7.4.0
+# Conflicts: libmgl-mpi7.0.0, libmgl-mpi7.1.0, libmgl-mpi7.2.0, libmgl-mpi7.4.0
+# 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.4.1
 Architecture: any

diff --git a/debian/patches/CMakeLists.patch b/debian/patches/CMakeLists.patch
index 97c907ad7bd76f6c8d0b1b5db9b9f19733d60c5b..5549b6d5e4a2004400d51b053c99934fb65aa5e7 100644 (file)
--- a/debian/patches/CMakeLists.patch
+++ b/debian/patches/CMakeLists.patch
@@ -1,15 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -95,7 +95,7 @@
- string(TIMESTAMP MGL_NIGHT "%d.%m.%y")
- 
- 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")
-@@ -103,9 +103,9 @@
+@@ -118,9 +118,9 @@
  option(enable-all-widgets "Enable all Widgets")
  option(enable-all-swig "Enable all SWIG based interfaces")
  option(enable-rvalue "Enable move constructor support (need C++11)" OFF)
@@ -21,16 +12,7 @@
  
  if(enable-pthread AND enable-openmp)
        message(SEND_ERROR "You can't enable POSIX threads and OpenMP at the same time!")
-@@ -113,7 +113,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)
- 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)
- CMAKE_DEPENDENT_OPTION(enable-doc-info "Enable INFO documentation" OFF "NOT enable-all-docs" ON)
-@@ -126,18 +126,18 @@
+@@ -141,19 +141,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)
@@ -53,20 +35,19 @@
 +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" ON "enable-qt5" OFF)
+-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" ON)
++CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF)
  
- if(UNIX AND enable-rvalue)
-       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-@@ -149,10 +149,10 @@
- set(QT_ENABLED ON)
+ # msvc fwprintf print char* for the specifier of "%s" format
+ if(MSVC AND MSVC_VERSION GREATER 1899)
+@@ -178,9 +178,9 @@
  endif(enable-qt4 OR enable-qt5)
  
--CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "QT_ENABLED" OFF)
+ CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "QT_ENABLED" 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" ON "QT_ENABLED" 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)
@@ -74,3 +55,12 @@
  MGL_DEPENDENT_OPTION(enable-octave-install "Octave interface will install for all users" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
  
  include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include)
+@@ -411,7 +411,7 @@
+               endif(NOT HDF5_FOUND)
+       endif(NOT HDF5_FOUND)
+       set(MGL_DEP_LIBS ${HDF5_LIBRARIES} ${HDF5_C_SHARED_LIBRARY} ${MGL_DEP_LIBS})
+-      include_directories(${HDF5_INCLUDE_DIR})
++      include_directories(${HDF5_INCLUDE_DIRS})
+ else(enable-hdf5)
+       set(MGL_HAVE_HDF5 0)
+ endif(enable-hdf5)