[SCM] Packaging for mathgl branch, experimental, updated. debian/2_rc2+svn383-1-3-gda2c813

Dimitrios Eftaxiopoulos eftaxi12 at otenet.gr
Tue Mar 27 20:11:18 UTC 2012


The following commit has been merged in the experimental branch:
commit 95272859bf1e18bf7b93c2cfea8ab4e1893a72e8
Merge: 4daa1909278a2615747e6a154d3a28a67661f13c ad1404891dc2249532dd060a63e16b2d6ef1e552
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Tue Mar 27 19:23:46 2012 +0300

    Merge tag 'upstream/2_rc2+svn387' into experimental
    
    Upstream version 2~rc2+svn387
    
    Conflicts:
    	lang/CMakeLists.txt

diff --combined CMakeLists.txt
index ee577db,4ac5192..64c3bec
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -2,28 -2,28 +2,28 @@@ cmake_minimum_required(VERSION 2.6
  
  project( MathGL )
  set(CMAKE_VERBOSE_MAKEFILE ON)
 -option(enable-double "Enable double precision in MathGL library")
 +option(enable-double "Enable double precision in MathGL library" ON)
  option(enable-all "Enable all features")
  option(enable-langall "Enable all language interfaces")
  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-ltdl "Enable loading modules support" ON)
 +option(enable-pthread "Enable POSIX threads support" ON)
 +option(enable-gsl "Enable gsl support" ON)
 +option(enable-jpeg "Enable jpeg 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 1.6 support")
 -option(enable-hdf5_18 "Enable hdf5 1.8 support")
 +option(enable-gif "Enable gif support" ON)
 +option(enable-hdf4 "Enable hdf4 support" ON)
 +option(enable-hdf5 "Enable hdf5 1.6 support" ON)
 +option(enable-hdf5_18 "Enable hdf5 1.8 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-doc "Enable documentation building")
 +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-doc "Enable documentation building" ON)
  
  include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include)
  
@@@ -297,6 -297,7 +297,7 @@@ endif(WIN32
  if(NOT WIN32)
  set(MGL_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/mathgl")
  set(MGL_DOC_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/mathgl")
+ set(MGL_MAN_PATH "${CMAKE_INSTALL_PREFIX}/share/man")
  set(MGL_FONT_PATH "${MGL_DATA_PATH}/fonts")
  install(DIRECTORY fonts/ DESTINATION ${MGL_FONT_PATH}
  		PATTERN ".svn" EXCLUDE

-- 
Packaging for mathgl



More information about the debian-science-commits mailing list