[mathgl] 02/02: Merge tag 'upstream/2.4.1'
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Oct 4 14:23:02 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository mathgl.
commit 92ae9b8fae4c900177b8b7d36736919646f2b965
Merge: cfaaa3b a1bd5e6
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Oct 4 15:22:29 2017 +0100
Merge tag 'upstream/2.4.1'
CMakeLists.txt | 323 +++-
ChangeLog.txt | 118 ++
FindMathGL2.cmake | 145 --
cmake-qt4.txt | 14 -
cmake-qt5.txt | 37 -
emblem.mgl | 2 +-
examples/CMakeLists.txt | 31 +-
examples/fltk_example.cpp | 15 +-
examples/full_test.cpp | 55 +-
examples/glut_example.cpp | 6 +-
examples/mgl_module.cpp | 6 +-
examples/mpi_test.cpp | 1 +
examples/qgl_example.cpp | 7 +-
examples/qt_example.cpp | 17 +-
examples/samples.cpp | 292 ++-
examples/wnd_samples.cpp | 25 +-
examples/wx_example.cpp | 3 +-
fonts/CMakeLists.txt | 16 +-
fonts/make_bin.cpp | 2 +-
include/CMakeLists.txt | 4 +-
include/config.h.in | 9 +-
include/mgl2/Fl_MathGL.h | 84 +-
include/mgl2/abstract.h | 82 +-
include/mgl2/addon.h | 2 +-
include/mgl2/base.h | 133 +-
include/mgl2/base_cf.h | 5 +-
include/mgl2/canvas.h | 74 +-
include/mgl2/canvas_cf.h | 46 +-
include/mgl2/canvas_wnd.h | 2 +-
include/mgl2/cont.h | 16 +-
include/mgl2/data.h | 167 +-
include/mgl2/data_cf.h | 87 +-
include/mgl2/datac.h | 62 +-
include/mgl2/datac_cf.h | 50 +-
include/mgl2/define.h | 96 +-
include/mgl2/eval.h | 4 +-
include/mgl2/evalc.h | 2 +-
include/mgl2/fit.h | 2 +-
include/mgl2/fltk.h | 8 +-
include/mgl2/font.h | 7 +-
include/mgl2/glut.h | 4 +-
include/mgl2/mgl.h | 106 +-
include/mgl2/mgl_cf.h | 2 +-
include/mgl2/mpi.h | 2 +-
include/mgl2/opengl.h | 5 +-
include/mgl2/other.h | 2 +-
include/mgl2/parser.h | 29 +-
include/mgl2/pde.h | 4 +-
include/mgl2/plot.h | 2 +-
include/mgl2/prim.h | 19 +-
include/mgl2/qmathgl.h | 22 +-
include/mgl2/qt.h | 8 +-
include/mgl2/surf.h | 21 +-
include/mgl2/thread.h | 2 +-
include/mgl2/type.h | 17 +-
include/mgl2/vect.h | 2 +-
include/mgl2/volume.h | 2 +-
include/mgl2/window.h | 2 +-
include/mgl2/wnd.h | 10 +-
include/mgl2/wx.h | 3 +-
json/Backend.cpp | 31 +-
json/Backend.hpp | 3 +
json/CMakeLists.txt | 60 +-
lang/CMakeLists.txt | 14 +-
lang/data.i | 70 +-
lang/mathgl.i | 1 +
lang/mgl.i | 55 +-
lang/type.i | 1 +
make_release | 57 -
mgltex/CMakeLists.txt | 22 +-
mgltex/Recompilation_decision.eps | 111 +-
mgltex/Recompilation_decision.pdf | Bin 77225 -> 77735 bytes
mgltex/Recompilation_decision.svg | 715 ++++---
mgltex/mgltex.dtx | 1384 ++++++++------
mgltex/mgltex.ins | 6 +-
mgltex/mgltex.pdf | Bin 521993 -> 546058 bytes
mgltex/sample.tex | 724 +++-----
src/CMakeLists.txt | 83 +-
src/addon.cpp | 12 +-
src/axis.cpp | 155 +-
src/base.cpp | 308 +++-
src/base_cf.cpp | 15 +-
src/canvas.cpp | 167 +-
src/canvas_cf.cpp | 43 +-
src/complex.cpp | 342 +++-
src/complex_ex.cpp | 175 +-
src/complex_io.cpp | 221 ++-
src/cont.cpp | 236 ++-
src/crust.cpp | 181 +-
src/data.cpp | 478 ++++-
src/data_ex.cpp | 187 +-
src/data_gr.cpp | 2 +-
src/data_io.cpp | 382 ++--
src/data_png.cpp | 15 +-
src/def_font.cc | 1651 +++++++++--------
src/eval.cpp | 18 +-
src/evalc.cpp | 43 +-
src/evalp.cpp | 119 +-
src/exec.cpp | 3696 -------------------------------------
src/export.cpp | 89 +-
src/export_2d.cpp | 126 +-
src/export_3d.cpp | 88 +-
src/fft.cpp | 299 ++-
src/fit.cpp | 35 +-
src/font.cpp | 152 +-
src/interp.hpp | 13 +-
src/mpi.cpp | 2 +-
src/obj.cpp | 1027 +++++------
src/opengl.cpp | 55 +-
src/other.cpp | 88 +-
src/parser.cpp | 460 +++--
src/pde.cpp | 734 ++++++--
src/pixel.cpp | 1462 ++++-----------
src/plot.cpp | 605 ++++--
src/prc.cpp | 39 +-
src/prc/PRC.h | 2 +
src/prc/oPRCFile.cc | 2 +-
src/prim.cpp | 217 ++-
src/s_hull/s_hull_pro.h | 1 +
src/surf.cpp | 220 ++-
src/tex_table.cc | 4 +-
src/vect.cpp | 522 +++---
src/volume.cpp | 159 +-
src/window.cpp | 36 +-
texinfo/CMakeLists.txt | 56 +-
texinfo/appendix_en.texi | 2 +-
texinfo/appendix_ru.texi | 2 +-
texinfo/concept_en.texi | 15 +-
texinfo/concept_ru.texi | 11 +-
texinfo/core_en.texi | 277 ++-
texinfo/core_ru.texi | 319 +++-
texinfo/data_en.texi | 342 +++-
texinfo/data_ru.texi | 393 +++-
texinfo/ex_mgl_en.texi | 115 +-
texinfo/ex_mgl_ru.texi | 113 +-
texinfo/example_en.texi | 120 +-
texinfo/example_ru.texi | 122 +-
texinfo/formats_en.texi | 30 +-
texinfo/formats_ru.texi | 30 +-
texinfo/parse_en.texi | 38 +-
texinfo/parse_ru.texi | 86 +-
texinfo/symbols_en.texi | 51 +-
texinfo/symbols_ru.texi | 51 +-
texinfo/time.texi | 241 +--
texinfo/time_big.texi | 241 +--
texinfo/version_hist.txt | 4 +
texinfo/web_en.texi | 245 +--
texinfo/web_ru.texi | 246 +--
texinfo/widget_en.texi | 29 +-
texinfo/widget_ru.texi | 29 +-
todo.txt | 117 +-
udav/CMakeLists.txt | 27 +-
udav/anim_dlg.cpp | 32 +-
udav/anim_dlg.h | 1 +
udav/args_dlg.cpp | 28 +-
udav/calc_dlg.cpp | 20 +-
udav/dat_pnl.cpp | 282 +--
udav/data_dlg.cpp | 22 +-
udav/data_dlg.h | 4 +-
udav/files_dlg.cpp | 27 +-
udav/files_dlg.h | 3 +
udav/find_dlg.cpp | 17 +-
udav/find_dlg.h | 3 +
udav/help_pnl.cpp | 20 +-
udav/help_pnl.h | 3 +
udav/hint_dlg.cpp | 56 +-
udav/hint_dlg.h | 2 +-
udav/info_dlg.cpp | 20 +-
udav/mem_pnl.cpp | 45 +-
udav/newcmd_dlg.cpp | 108 +-
udav/open_dlg.cpp | 46 +-
udav/opt_dlg.cpp | 45 +-
udav/opt_dlg.h | 3 +
udav/plot_pnl.cpp | 216 +--
udav/prop_dlg.cpp | 75 +-
udav/qmglsyntax.cpp | 11 +-
udav/setup_dlg.cpp | 86 +-
udav/setup_dlg.h | 3 +
udav/style_dlg.cpp | 289 +--
udav/style_dlg.h | 4 +-
udav/subplot_dlg.cpp | 146 +-
udav/text_pnl.cpp | 120 +-
udav/textedit.cpp | 3 +-
udav/textedit.h | 3 +
udav/udav_wnd.cpp | 172 +-
utils/CMakeLists.txt | 53 +-
utils/make_pas.cpp | 2 +
utils/mglcgi.cpp | 17 +-
utils/mglconv.cpp | 53 +-
utils/mglview.cpp | 56 +-
widgets/CMakeLists.txt | 11 +-
widgets/fltk.cpp | 787 +++++---
widgets/glut.cpp | 23 +-
widgets/qt.cpp | 366 ++--
widgets/qt4/CMakeLists.txt | 27 +-
widgets/qt5/CMakeLists.txt | 23 +-
widgets/wx.cpp | 39 +-
197 files changed, 14160 insertions(+), 13105 deletions(-)
diff --cc CMakeLists.txt
index c9eb64b,9070595..7a95dce
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -91,11 -138,14 +138,14 @@@ MACRO(MGL_DEPENDENT_OPTION option doc d
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")
+ if(WIN32)
+ option(enable-dep-dll "Enable copying off all dependent dll libraries to the install directory" OFF)
+ endif(WIN32)
+
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")
@@@ -126,36 -177,63 +176,55 @@@ CMAKE_DEPENDENT_OPTION(enable-mgltex "E
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-glut "Enable glut support" OFF "NOT enable-all-widgets" ON)
-CMAKE_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-all-widgets" ON)
-CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-all-widgets" ON)
+CMAKE_DEPENDENT_OPTION(enable-jpeg "Enable jpeg support" ON "NOT enable-all" ON)
+MGL_DEPENDENT_OPTION(enable-gsl "Enable gsl support" ON "NOT enable-lgpl" ON "NOT enable-all" ON)
+MGL_DEPENDENT_OPTION(enable-hdf4 "Enable hdf4 support" ON "NOT enable-lgpl" ON "NOT enable-all" ON)
+MGL_DEPENDENT_OPTION(enable-hdf5 "Enable hdf5 support" ON "NOT enable-lgpl" ON "NOT enable-all" ON)
+CMAKE_DEPENDENT_OPTION(enable-pdf "Enable pdf support" ON "NOT enable-all" ON)
+CMAKE_DEPENDENT_OPTION(enable-gif "Enable gif support" ON "NOT enable-all" ON)
+CMAKE_DEPENDENT_OPTION(enable-glut "Enable glut support" ON "NOT enable-all-widgets" ON)
+CMAKE_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" ON "NOT enable-all-widgets" ON)
+CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" ON "NOT enable-all-widgets" ON)
CMAKE_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" OFF "NOT enable-all-widgets" ON)
-CMAKE_DEPENDENT_OPTION(enable-qt4asqt "Set Qt4 as default libmgl-qt" OFF "enable-qt4" OFF)
-CMAKE_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" OFF "NOT enable-all-widgets" ON)
-CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" OFF "enable-qt5" OFF)
-
-# msvc fwprintf print char* for the specifier of "%s" format
-if(MSVC AND MSVC_VERSION GREATER 1899)
- SET(CMAKE_CXX_FLAGS "/EHsc -D_CRT_STDIO_ISO_WIDE_SPECIFIERS ${CMAKE_CXX_FLAGS}")
- SET(CMAKE_C_FLAGS "-D_CRT_STDIO_ISO_WIDE_SPECIFIERS ${CMAKE_C_FLAGS}")
-endif(MSVC AND MSVC_VERSION GREATER 1899)
+CMAKE_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" ON "NOT enable-all-widgets" ON)
+CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" ON)
- if(UNIX AND enable-rvalue)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
- endif(UNIX AND enable-rvalue)
+ include(CheckCXXSourceCompiles)
- # MSVC does not require any special flags
+ if(${CMAKE_SIZEOF_VOID_P} EQUAL 4)
+ set(CMAKE_REQUIRED_FLAGS -msse2 -mfpmath=sse)
+ CHECK_CXX_SOURCE_COMPILES("
+ int main(void){}" mgl_sse)
+ if(mgl_sse)
+ SET(CMAKE_CXX_FLAGS "-msse2 -mfpmath=sse ${CMAKE_CXX_FLAGS}")
+ SET(CMAKE_C_FLAGS "-msse2 -mfpmath=sse ${CMAKE_C_FLAGS}")
+ endif(mgl_sse)
+ unset(CMAKE_REQUIRED_FLAGS)
+ endif(${CMAKE_SIZEOF_VOID_P} EQUAL 4)
if(enable-qt4 OR enable-qt5)
- set(QT_ENABLED ON)
+ set(QT_ENABLED ON)
+ if(enable-qt4asqt AND enable-qt5asqt)
+ message(SEND_ERROR "You cannot make Qt4 and Qt5 as qt at the same time.")
+ endif(enable-qt4asqt AND enable-qt5asqt)
+ if(enable-qt4 AND NOT enable-qt5)
+ set(enable-qt4asqt TRUE)
+ endif(enable-qt4 AND NOT enable-qt5)
+ if(enable-qt5 AND NOT enable-qt4)
+ set(enable-qt5asqt TRUE)
+ endif(enable-qt5 AND NOT enable-qt4)
+ # if(NOT enable-opengl)
+ # message(SEND_ERROR "You cannot build MathGL with Qt4 or Qt5 without OpenGL enabled.")
+ # endif(NOT enable-opengl)
endif(enable-qt4 OR enable-qt5)
-CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample (WebKit variant is the default)." ON "QT_ENABLED" OFF)
-CMAKE_DEPENDENT_OPTION(enable-json-sample-we "Enable JSON sample (WebEngine variant)." OFF "enable-json-sample" OFF)
-MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
+CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "QT_ENABLED" ON)
+MGL_DEPENDENT_OPTION(enable-python "Enable python interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
MGL_DEPENDENT_OPTION(enable-lua "Enable Lua (v.5.1) 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 "Enable octave interface" ON "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)
- include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include)
+ include_directories( ${MathGL2_SOURCE_DIR}/include ${MathGL2_BINARY_DIR}/include)
set(MGL_INCLUDE_PATH "${CMAKE_INSTALL_PREFIX}/include/mgl2")
set(MGL_CGI_PATH "${CMAKE_INSTALL_PREFIX}/share/mathgl" CACHE STRING "Set CGI install directory")
set(MGL_DEF_FONT "STIX" CACHE STRING "Set default font name")
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathgl.git
More information about the debian-science-commits
mailing list