From: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Date: Sat, 18 Jul 2015 14:33:48 +0000 (+0300)
Subject: Merge tag 'upstream/2.3.3'
X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~99
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6f108dec916188146302fecc7e7b028535a53fb4;p=mathgl.git

Merge tag 'upstream/2.3.3'

Upstream version 2.3.3
---

6f108dec916188146302fecc7e7b028535a53fb4
diff --cc CMakeLists.txt
index c951953,2aae334..6035d4a
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -11,13 -11,10 +11,13 @@@ if(NOT CMAKE_BUILD_TYPE
  endif(NOT CMAKE_BUILD_TYPE)
  
  set(CMAKE_VERBOSE_MAKEFILE ON)
- #set(MathGL_VERSION_MAJOR 2)
- #set(MathGL_VERSION_MINOR 2.2)
+ set(MathGL_VERSION_MAJOR 2)
+ set(MathGL_VERSION_MINOR 3.3)
  set(MathGL_SOVERSION 7.4.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$")
@@@ -63,9 -60,10 +63,10 @@@ ENDMACRO(MGL_DEPENDENT_OPTION
  include(CMakeDependentOption)
  
  set(MGL_LIB_INSTALL_DIR "lib" CACHE STRING "Set library install directory")
+ string(TIMESTAMP MGL_NIGHT "%d.%m.%y")
  
  option(enable-double "Enable double precision in MathGL library" ON)
 -option(enable-mpi "Enable mpi")
 +option(enable-mpi "Enable mpi" ON)
  option(enable-opengl "Enable OpenGL support" ON)
  option(enable-all-docs "Enable all documentation building")
  #option(enable-doc "Enable documentation building")