From: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Date: Mon, 24 Dec 2012 19:58:19 +0000 (+0200)
Subject: Merge tag 'upstream/2.1.1' into experimental
X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~151^2~54
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=72e5faa675d7c3a1dc9c1d1fca8de027d3cd2088;p=mathgl.git

Merge tag 'upstream/2.1.1' into experimental

Upstream version 2.1.1
---

72e5faa675d7c3a1dc9c1d1fca8de027d3cd2088
diff --cc CMakeLists.txt
index bbe4cab,a5bd669..496cb83
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -13,17 -13,19 +13,19 @@@ 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")