[SCM] Packaging for mathgl branch, experimental, updated. debian/2.1.2-1-3-gf31a279

Dimitrios Eftaxiopoulos eftaxi12 at otenet.gr
Thu Apr 25 14:33:58 UTC 2013 

The following commit has been merged in the experimental branch:
commit 118642a667ffd68dbc5d9a72a9b0c661bcbd9d5f
Merge: ea62c8c679e1617ae1ff1600e910ed66e8ced68d 59b4eec7fd5c7b75915287ffd7a59a931bd16cd8
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Sun Apr 21 18:56:10 2013 +0300

    Merge tag 'upstream/2.1.2+svn722' into experimental
    
    Upstream version 2.1.2+svn722
    
    Conflicts:
    	CMakeLists.txt

diff --combined CMakeLists.txt.orig
index c8ae860,583f290..ae44f81
--- a/CMakeLists.txt.orig
+++ b/CMakeLists.txt.orig
@@@ -11,36 -11,79 +11,107 @@@ set(CMAKE_VERBOSE_MAKEFILE ON
  set(MathGL_VERSION_MAJOR 2)
  set(MathGL_VERSION_MINOR 1.2)
  
+ 
+ MACRO(MGL_DEPENDENT_OPTION option doc default depends1 force1 depends2 force2)
+   IF(${option}_ISSET MATCHES "^${option}_ISSET$")
+     SET(${option}_AVAILABLE 1)
+     IF(${force1})
+     FOREACH(d ${depends1})
+       STRING(REGEX REPLACE " +" ";" CMAKE_DEPENDENT_OPTION_DEP "${d}")
+       IF(${CMAKE_DEPENDENT_OPTION_DEP})
+       ELSE(${CMAKE_DEPENDENT_OPTION_DEP})
+           SET(${option}_AVAILABLE 0)
+           SET(depends1_AVAILABLE 1)
+       ENDIF(${CMAKE_DEPENDENT_OPTION_DEP})
+     ENDFOREACH(d)
+     ENDIF(${force1})
+     IF(${force2})
+     FOREACH(d ${depends2})
+       STRING(REGEX REPLACE " +" ";" CMAKE_DEPENDENT_OPTION_DEP "${d}")
+       IF(${CMAKE_DEPENDENT_OPTION_DEP})
+       ELSE(${CMAKE_DEPENDENT_OPTION_DEP})
+           SET(${option}_AVAILABLE 0)
+           SET(depends2_AVAILABLE 1)
+       ENDIF(${CMAKE_DEPENDENT_OPTION_DEP})
+     ENDFOREACH(d)
+     ENDIF(${force2})
+     IF(${option}_AVAILABLE)
+       OPTION(${option} "${doc}" "${default}")
+       SET(${option} "${${option}}" CACHE BOOL "${doc}" FORCE)
+     ELSE(${option}_AVAILABLE)
+       IF(${option} MATCHES "^${option}$")
+       ELSE(${option} MATCHES "^${option}$")
+         SET(${option} "${${option}}" CACHE INTERNAL "${doc}")
+       ENDIF(${option} MATCHES "^${option}$")
+         IF(depends1_AVAILABLE)
+           SET(${option} OFF)
+         ELSEIF(depends2_AVAILABLE)
+           SET(${option} ON)
+         ENDIF(depends1_AVAILABLE)
+     ENDIF(${option}_AVAILABLE)
+   ELSE(${option}_ISSET MATCHES "^${option}_ISSET$")
+     SET(${option} "${${option}_ISSET}")
+   ENDIF(${option}_ISSET MATCHES "^${option}_ISSET$")
+ ENDMACRO(MGL_DEPENDENT_OPTION)
  include(CMakeDependentOption)
  
  set(MGL_LIB_INSTALL_DIR "lib" CACHE STRING "Set library install directory")
  
  option(enable-double "Enable double precision in MathGL library" ON)
++<<<<<<< HEAD
 +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" 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-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" 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" ON)
++=======
+ option(enable-simple "Slightly increase drawing speed but disable mglDataA class")
+ option(enable-mpi "Enable mpi")
+ 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" ON)
+ 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")
+ 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-opengl "Enable OpenGL support" ON "NOT enable-mpi" OFF)
+ MGL_DEPENDENT_OPTION(enable-glut "Enable glut support" OFF "NOT enable-lgpl;NOT enable-mpi" ON "NOT enable-all-widgets" ON)
+ MGL_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-lgpl;NOT enable-mpi" ON "NOT enable-all-widgets" ON)
+ CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-lgpl;NOT enable-mpi" OFF)
+ MGL_DEPENDENT_OPTION(enable-qt "Enable Qt4 widget" OFF "NOT enable-lgpl;NOT enable-mpi" ON "NOT enable-all-widgets" ON)
+ MGL_DEPENDENT_OPTION(enable-python "Enable python 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)
++>>>>>>> upstream/2.1.2+svn722
  
  include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include)
  set(MGL_INCLUDE_PATH "${CMAKE_INSTALL_PREFIX}/include/mgl2")
@@@ -83,7 -126,17 +154,17 @@@ else(enable-mpi
  	set(MGL_HAVE_MPI 0)
  endif(enable-mpi)
  
- if((enable-all OR enable-gsl) AND (NOT enable-lgpl) )
+ if(enable-pthread)
+ 	set(MGL_HAVE_PTHREAD 1)
+ 	include(FindThreads)
+ 	if(NOT CMAKE_USE_PTHREADS_INIT)
+ 		message(SEND_ERROR "Couldn't find POSIX threads library.")
+ 	endif(NOT CMAKE_USE_PTHREADS_INIT)
+ else(enable-pthread)
+ 	set(MGL_HAVE_PTHREAD 0)
+ endif(enable-pthread)
+ 
+ if(enable-gsl)
  	set(MGL_HAVE_GSL 1)
  	find_library(GSL_LIB gsl)
  	find_library(GSL_CBLAS_LIB gslcblas)
@@@ -94,9 -147,9 +175,9 @@@
  		message(SEND_ERROR "${GSL_INCLUDE_DIR}")
  		message(SEND_ERROR "Couldn't find GSL libraries.")
  	endif(NOT GSL_LIB OR NOT GSL_CBLAS_LIB OR NOT GSL_INCLUDE_DIR)
- else((enable-all OR enable-gsl) AND (NOT enable-lgpl) )
+ else(enable-gsl)
  	set(MGL_HAVE_GSL 0)
- endif((enable-all OR enable-gsl) AND (NOT enable-lgpl) )
+ endif(enable-gsl)
  
  #if(enable-all OR enable-ltdl)
  #	set(MGL_HAVE_LTDL 1)
@@@ -111,17 -164,7 +192,7 @@@
  #	set(MGL_HAVE_LTDL 0)
  #endif(enable-all OR enable-ltdl)
  
- if(enable-all OR enable-pthread)
- 	set(MGL_HAVE_PTHREAD 1)
- 	include(FindThreads)
- 	if(NOT CMAKE_USE_PTHREADS_INIT)
- 		message(SEND_ERROR "Couldn't find POSIX threads library.")
- 	endif(NOT CMAKE_USE_PTHREADS_INIT)
- else(enable-all OR enable-pthread)
- 	set(MGL_HAVE_PTHREAD 0)
- endif(enable-all OR enable-pthread)
- 
- if((enable-all OR enable-hdf4) AND (NOT enable-lgpl) )
+ if(enable-hdf4)
  	set(MGL_HAVE_HDF4 1)
  	find_library(HDF4_LIB df)
  	find_library(HDF4MF_LIB mfhdf)
@@@ -132,42 -175,43 +203,43 @@@
  		message(SEND_ERROR "${HDF4_INCLUDE_DIR}")
  		message(SEND_ERROR "Couldn't find HDF4 libraries.")
  	endif(NOT HDF4_LIB OR NOT HDF4MF_LIB OR NOT HDF4_INCLUDE_DIR)
- else((enable-all OR enable-hdf4) AND (NOT enable-lgpl) )
+ else(enable-hdf4)
  	set(MGL_HAVE_HDF4 0)
- endif((enable-all OR enable-hdf4) AND (NOT enable-lgpl) )
+ endif(enable-hdf4)
  
- if((enable-all OR enable-hdf5) AND (NOT enable-lgpl) )
+ if(enable-hdf5)
+ #	message(STATUS "enable hdf5")
  	set(MGL_HAVE_HDF5 1)
  	include(FindHDF5)
  	if(NOT HDF5_FOUND)
  		message(SEND_ERROR "Couldn't find HDF5 library.")
  	endif(NOT HDF5_FOUND)
- else((enable-all OR enable-hdf5) AND (NOT enable-lgpl) )
+ else(enable-hdf5)
  	set(MGL_HAVE_HDF5 0)
- endif((enable-all OR enable-hdf5) AND (NOT enable-lgpl) )
+ endif(enable-hdf5)
  
- if(enable-all OR enable-jpeg)
+ if(enable-jpeg)
  	set(MGL_HAVE_JPEG 1)
  	include(FindJPEG)
  	if(NOT JPEG_FOUND)
  		message(SEND_ERROR "Couldn't find JPEG library.")
  	endif(NOT JPEG_FOUND)
- else(enable-all OR enable-jpeg)
+ else(enable-jpeg)
  	set(MGL_HAVE_JPEG 0)
- endif(enable-all OR enable-jpeg)
+ endif(enable-jpeg)
  
  
- if(enable-all OR enable-zlib)
+ if(enable-zlib)
  	set(MGL_HAVE_ZLIB 1)
  	include(FindZLIB)
  	if(NOT ZLIB_FOUND)
  		message(SEND_ERROR "Couldn't find ZLib library.")
  	endif(NOT ZLIB_FOUND)
- else(enable-all OR enable-zlib)
+ else(enable-zlib)
  	set(MGL_HAVE_ZLIB 0)
- endif(enable-all OR enable-zlib)
+ endif(enable-zlib)
  
- if(enable-all OR enable-png)
+ if(enable-png)
  	set(MGL_HAVE_PNG 1)
  	if(NOT MGL_HAVE_ZLIB)
  		message(SEND_ERROR "You have to enable ZLib if you plan to use PNG export.")
@@@ -176,12 -220,12 +248,12 @@@
  	if(NOT PNG_FOUND)
  		message(SEND_ERROR "Couldn't find PNG library.")
  	endif(NOT PNG_FOUND)
- else(enable-all OR enable-png)
+ else(enable-png)
  	set(MGL_HAVE_PNG 0)
- endif(enable-all OR enable-png)
+ endif(enable-png)
  
  
- if( enable-all OR enable-pdf )
+ if(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.")
@@@ -196,31 -240,31 +268,31 @@@
  	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 )
+ else(enable-pdf)
  	set(MGL_HAVE_PDF 0)
- endif( enable-all OR enable-pdf )
+ endif(enable-pdf)
  
- if(enable-all OR enable-gif)
+ if(enable-gif)
  	set(MGL_HAVE_GIF 1)
  	include(FindGIF)
  	if(NOT GIF_FOUND)
  		message(SEND_ERROR "Couldn't find GIF library.")
  	endif(NOT GIF_FOUND)
- else(enable-all OR enable-gif)
+ else(enable-gif)
  	set(MGL_HAVE_GIF 0)
- endif(enable-all OR enable-gif)
+ endif(enable-gif)
  
- if(enable-all OR enable-opengl)
+ if(enable-opengl)
  	set(MGL_HAVE_OPENGL 1)
  	include(FindOpenGL)
  	if(NOT OPENGL_FOUND)
  		message(SEND_ERROR "Couldn't find OpenGL libraries.")
  	endif(NOT OPENGL_FOUND)
- else(enable-all OR enable-opengl)
+ else(enable-opengl)
  	set(MGL_HAVE_OPENGL 0)
- endif(enable-all OR enable-opengl)
+ endif(enable-opengl)
  
- if((enable-all-widgets OR enable-glut) AND (NOT enable-lgpl) )
+ if(enable-glut)
  	set(MGL_HAVE_GLUT 1)
  	if(NOT MGL_HAVE_OPENGL)
  		message(SEND_ERROR "You have to enable OpenGL if you plan to use GLUT.")
@@@ -229,44 -273,44 +301,44 @@@
  	if(NOT GLUT_FOUND)
  		message(SEND_ERROR "Couldn't find GLUT library.")
  	endif(NOT GLUT_FOUND)
- else((enable-all-widgets OR enable-glut) AND (NOT enable-lgpl) )
+ else(enable-glut)
  	set(MGL_HAVE_GLUT 0)
- endif((enable-all-widgets OR enable-glut) AND (NOT enable-lgpl) )
+ endif(enable-glut)
  
- if((enable-all-widgets OR enable-fltk) AND (NOT enable-lgpl) )
+ if(enable-fltk)
  	set(MGL_HAVE_FLTK 1)
  	include(FindFLTK)
  	if(NOT FLTK_FOUND)
  		message(SEND_ERROR "Couldn't find FLTK library.")
  	endif(NOT FLTK_FOUND)
- else((enable-all-widgets OR enable-fltk) AND (NOT enable-lgpl) )
+ else(enable-fltk)
  	set(MGL_HAVE_FLTK 0)
- endif((enable-all-widgets OR enable-fltk) AND (NOT enable-lgpl) )
+ endif(enable-fltk)
  
  #if((enable-all-widgets OR enable-wx) AND (NOT enable-lgpl) )
- if((enable-wx) AND (NOT enable-lgpl) )
+ if(enable-wx)
  	set(MGL_HAVE_WX 1)
  	FIND_PACKAGE(wxWidgets COMPONENTS base core gl)
  	if(NOT wxWidgets_FOUND)
  		message(SEND_ERROR "Couldn't find wxWidgets library.")
  	endif(NOT wxWidgets_FOUND)
  #else((enable-all-widgets OR enable-wx) AND (NOT enable-lgpl) )
- else((enable-wx) AND (NOT enable-lgpl) )
+ else(enable-wx)
  	set(MGL_HAVE_WX 0)
  #endif((enable-all-widgets OR enable-wx) AND (NOT enable-lgpl) )
- endif((enable-wx) AND (NOT enable-lgpl) )
+ endif(enable-wx)
  
- if((enable-all-widgets OR enable-qt) AND (NOT enable-lgpl) )
+ if(enable-qt)
  	set(MGL_HAVE_QT 1)
- 	FIND_PACKAGE(Qt4)
+ 	FIND_PACKAGE(Qt4 4.8 REQUIRED QtCore QtGui QtNetwork QtWebKit)
  	if(NOT QT4_FOUND)
  		message(SEND_ERROR "Couldn't find Qt4 library.")
  	endif(NOT QT4_FOUND)
- else((enable-all-widgets OR enable-qt) AND (NOT enable-lgpl) )
+ else(enable-qt)
  	set(MGL_HAVE_QT 0)
- endif((enable-all-widgets OR enable-qt) AND (NOT enable-lgpl) )
+ endif(enable-qt)
  
- if((enable-all-swig OR enable-python) AND (NOT enable-lgpl) )
+ if(enable-python)
  	set(MGL_HAVE_PYTHON 1)
  	FIND_PACKAGE(PythonInterp)
  	if(NOT PYTHONINTERP_FOUND)
@@@ -285,11 -329,11 +357,11 @@@
  	if(NOT NUMPY_INCLUDE_PATH)
  		message(SEND_ERROR "Couldn't find numpy.")
  	endif(NOT NUMPY_INCLUDE_PATH)
- else((enable-all-swig OR enable-python) AND (NOT enable-lgpl) )
+ else(enable-python)
  	set(MGL_HAVE_PYTHON 0)
- endif((enable-all-swig OR enable-python) AND (NOT enable-lgpl) )
+ endif(enable-python)
  
- if((enable-all-swig OR enable-octave) AND (NOT enable-lgpl) )
+ if(enable-octave)
  	set(MGL_HAVE_OCTAVE 1)
  	find_program(oct_prog octave-config)
  	if(NOT oct_prog)
@@@ -307,9 -351,9 +379,9 @@@
  	if(NOT oct_tar)
  		message(SEND_ERROR "Couldn't find tar needed for octave interfaces creation.")
  	endif(NOT oct_tar)
- else((enable-all-swig OR enable-octave) AND (NOT enable-lgpl) )
+ else(enable-octave)
  	set(MGL_HAVE_OCTAVE 0)
- endif((enable-all-swig OR enable-octave) AND (NOT enable-lgpl) )
+ endif(enable-octave)
  
  if(enable-doc)
  	set(MGL_HAVE_DOC 1)
@@@ -366,6 -410,7 +438,7 @@@ add_subdirectory( src 
  add_subdirectory( widgets )
  add_subdirectory( include )
  add_subdirectory( udav )
+ add_subdirectory( json )
  #add_subdirectory( mgllab )
  add_subdirectory( lang )
  if(NOT MSVC AND NOT BORLAND)

-- 
Packaging for mathgl

More information about the debian-science-commits mailing list