[SCM] Packaging for mathgl branch, experimental, updated. debian/2.0.3-1-16-gdb2aad2

[Dimitrios Eftaxiopoulos]

The following commit has been merged in the experimental branch:
commit 72e5faa675d7c3a1dc9c1d1fca8de027d3cd2088
Merge: 794e2a277876f3bea654cbf546d381627ff1a690 f82a800771ec0279dd36e257831f876e3b57688a
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Mon Dec 24 21:58:19 2012 +0200

    Merge tag 'upstream/2.1.1' into experimental
    
    Upstream version 2.1.1

diff --combined CMakeLists.txt
index bbe4cab,a5bd669..496cb83
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,4 -1,4 +1,4 @@@
- cmake_minimum_required(VERSION 2.8.4)
+ cmake_minimum_required(VERSION 2.8)
  
  project( MathGL )
  
@@@ -9,37 -9,39 +9,39 @@@ endif(NOT CMAKE_BUILD_TYPE
  
  set(CMAKE_VERBOSE_MAKEFILE ON)
  set(MathGL_VERSION_MAJOR 2)
- set(MathGL_VERSION_MINOR 1)
+ set(MathGL_VERSION_MINOR 1.1)
  
  include(CMakeDependentOption)
  
+ 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-all "Enable all core features")
 -option(enable-all-widgets "Enable all Widgets")
 -option(enable-all-swig "Enable all SWIG based interfaces")
 +option(enable-simple "Slightly increase drawing speed but disable mglDataA class" OFF)
 +option(enable-mpi "Enable mpi" ON)
 +option(enable-all "Enable all core features" ON)
 +option(enable-all-widgets "Enable all Widgets" ON)
 +option(enable-all-swig "Enable all SWIG based interfaces" ON)
  option(enable-lgpl "Enable only LGPL part of MathGL" OFF)
  #option(enable-ltdl "Enable loading modules support")
 -option(enable-pthread "Enable POSIX threads support")
 -option(enable-gsl "Enable gsl support")
 -option(enable-jpeg "Enable jpeg support")
 +option(enable-pthread "Enable POSIX threads support" ON)
 +option(enable-gsl "Enable gsl support" ON)
 +option(enable-jpeg "Enable jpeg support" ON)
  option(enable-png "Enable png support" ON)
  option(enable-zlib "Enable zlib support" ON)
  #option(enable-u3d "Enable u3d support")
 -option(enable-pdf "Enable pdf support")
 -option(enable-gif "Enable gif support")
 -option(enable-hdf4 "Enable hdf4 support")
 -option(enable-hdf5 "Enable hdf5 support")
 +option(enable-pdf "Enable pdf support" ON)
 +option(enable-gif "Enable gif support" ON)
 +option(enable-hdf4 "Enable hdf4 support" ON)
 +option(enable-hdf5 "Enable hdf5 support" ON)
  option(enable-opengl "Enable OpenGL support" ON)
 -option(enable-glut "Enable glut support")
 -option(enable-fltk "Enable fltk widget")
 -option(enable-wx "Enable wxWidget widget")
 -option(enable-qt "Enable Qt4 widget")
 -option(enable-python "Enable python interface")
 -option(enable-octave "Enable octave interface")
 +option(enable-glut "Enable glut support" ON)
 +option(enable-fltk "Enable fltk widget" ON)
 +option(enable-wx "Enable wxWidget widget" ON)
 +option(enable-qt "Enable Qt4 widget" ON)
 +option(enable-python "Enable python interface" ON)
 +option(enable-octave "Enable octave interface" ON)
  option(enable-octave-install "Octave interface will install for all users" ON)
 -option(enable-doc "Enable documentation building")
 +option(enable-doc "Enable documentation building" ON)
  
  include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include)
  
@@@ -173,30 -175,14 +175,14 @@@ else(enable-all OR enable-png
  endif(enable-all OR enable-png)
  
  
- # if(enable-u3d AND (NOT enable-lgpl) )
- # 	set(MGL_HAVE_U3D 1)
- # 	find_library(U3D_LIB IDTF)
- # 	if(NOT U3D_LIB)
- # 		message(SEND_ERROR "Couldn't find U3D libraries.")
- # 	endif(NOT U3D_LIB)
- # 	find_path(U3D_INCLUDE_DIR u3d/SceneConverterLib.h)
- # 	if(NOT U3D_INCLUDE_DIR)
- # 		message(SEND_ERROR "Couldn't find U3D headers.")
- # 	endif(NOT U3D_INCLUDE_DIR)
- # 	message(STATUS "Found U3D libraries at: ${U3D_LIB}")
- # 	message(STATUS "Found U3D headers: ${U3D_INCLUDE_DIR}")
- # else(enable-u3d AND (NOT enable-lgpl) )
- # 	set(MGL_HAVE_U3D 0)
- # endif(enable-u3d AND (NOT enable-lgpl) )
- 
- if((enable-all OR enable-pdf) AND (NOT enable-lgpl) )
+ if( enable-all OR enable-pdf )
  	set(MGL_HAVE_PDF 1)
  	if(NOT MGL_HAVE_PNG)
  		message(SEND_ERROR "You have to enable PNG if you plan to use PDF export.")
  	endif(NOT MGL_HAVE_PNG)
  	find_library(HPDF_LIB hpdf)
  	if(NOT HPDF_LIB)
- 		message(SEND_ERROR "Couldn't find libHaru.")
+ 		message(SEND_ERROR "Couldn't find libHaru or libhpdf.")
  	endif(NOT HPDF_LIB)
  	find_path(HPDF_INCLUDE_DIR hpdf_u3d.h)
  	if(NOT HPDF_INCLUDE_DIR)
@@@ -204,9 -190,9 +190,9 @@@
  	endif(NOT HPDF_INCLUDE_DIR)
  #	message(STATUS "Found libHaru library at: ${HPDF_LIB}")
  #	message(STATUS "Found libHaru headers: ${HPDF_INCLUDE_DIR}")
- else((enable-all OR enable-pdf) AND (NOT enable-lgpl) )
+ else( enable-all OR enable-pdf )
  	set(MGL_HAVE_PDF 0)
- endif((enable-all OR enable-pdf) AND (NOT enable-lgpl) )
+ endif( enable-all OR enable-pdf )
  
  if(enable-all OR enable-gif)
  	set(MGL_HAVE_GIF 1)

-- 
Packaging for mathgl