From: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Date: Sat, 15 Mar 2014 09:41:43 +0000 (+0200)
Subject: Merge tag 'upstream/2.2.2+svn930'
X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~140
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7380130cd2719cce18008a4eb9b98fe761a708dc;p=mathgl.git

Merge tag 'upstream/2.2.2+svn930'

Upstream version 2.2.2+svn930
---

7380130cd2719cce18008a4eb9b98fe761a708dc
diff --cc CMakeLists.txt
index 2544894,f279dce..4aa93ee
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -9,12 -9,9 +9,12 @@@ endif(NOT CMAKE_BUILD_TYPE
  
  set(CMAKE_VERBOSE_MAKEFILE ON)
  set(MathGL_VERSION_MAJOR 2)
- set(MathGL_VERSION_MINOR 2.1)
+ set(MathGL_VERSION_MINOR 2.2)
  set(MathGL_SOVERSION 7.2.0)
  
 +set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro")
 +set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro")
 +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro")
  
  MACRO(MGL_DEPENDENT_OPTION option doc default depends1 force1 depends2 force2)
    IF(${option}_ISSET MATCHES "^${option}_ISSET$")