rpms
/
mathgl
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to new 2.3.5.1. Second attempt

This commit is contained in:
Dmitrij S. Kryzhevich 2017-01-09 17:31:56 +07:00
parent 23bf7489e1
commit 77811651f3
6 changed files with 122 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
mathgl-2.3.5.1-examples.patch Normal file
View File

@ -0,0 +1,53 @@
diff -urp mathgl-2.3.5.1/examples/CMakeLists.txt mathgl-2.3.5.1-examples/examples/CMakeLists.txt
--- mathgl-2.3.5.1/examples/CMakeLists.txt 2016-06-19 23:06:40.000000000 +0600
+++ mathgl-2.3.5.1-examples/examples/CMakeLists.txt 2016-12-27 09:49:06.567485492 +0700
@@ -1,21 +1,25 @@
add_executable(mgl_example wnd_samples.cpp full_test.cpp samples.cpp)
target_link_libraries(mgl_example mgl-static ${getopt_lib-static})
+SET(MGL_INSTALL_EXAMPLES_LIST mgl_example)
if(MGL_HAVE_FLTK)
include_directories(${FLTK_INCLUDE_DIR})
add_executable(mgl_fltk_example wnd_samples.cpp fltk_example.cpp)
target_link_libraries(mgl_fltk_example mgl-fltk)
+ SET(MGL_INSTALL_EXAMPLES_LIST ${MGL_INSTALL_EXAMPLES_LIST} mgl_fltk_example)
endif(MGL_HAVE_FLTK)
if(MGL_HAVE_GLUT)
add_executable(mgl_glut_example wnd_samples.cpp glut_example.cpp)
target_link_libraries(mgl_glut_example mgl-glut)
+ SET(MGL_INSTALL_EXAMPLES_LIST ${MGL_INSTALL_EXAMPLES_LIST} mgl_glut_example)
endif(MGL_HAVE_GLUT)
if(MGL_HAVE_WX)
include(${wxWidgets_USE_FILE})
add_executable(mgl_wx_example wnd_samples.cpp wx_example.cpp)
target_link_libraries(mgl_wx_example mgl-wx)
+ SET(MGL_INSTALL_EXAMPLES_LIST ${MGL_INSTALL_EXAMPLES_LIST} mgl_wx_example)
endif(MGL_HAVE_WX)
if(QT_ENABLED)
@@ -27,6 +31,7 @@ if(QT_ENABLED)
include(../cmake-qt4.txt)
target_link_libraries(mgl_qt_example mgl-qt4)
endif(enable-qt5)
+ SET(MGL_INSTALL_EXAMPLES_LIST ${MGL_INSTALL_EXAMPLES_LIST} mgl_qt_example)
if(MGL_HAVE_OPENGL)
add_executable(mgl_qgl_example wnd_samples.cpp qgl_example.cpp)
@@ -35,6 +40,7 @@ if(QT_ENABLED)
else(enable-qt5)
target_link_libraries(mgl_qgl_example mgl ${MGL_QT4_LIBS})
endif(enable-qt5)
+ SET(MGL_INSTALL_EXAMPLES_LIST ${MGL_INSTALL_EXAMPLES_LIST} mgl_qgl_example)
endif(MGL_HAVE_OPENGL)
endif(QT_ENABLED)
@@ -43,3 +49,7 @@ if(MGL_HAVE_LTDL)
target_link_libraries(mgl_module mgl) # for compatibility with win32
endif(MGL_HAVE_LTDL)
+install(
+ TARGETS ${MGL_INSTALL_EXAMPLES_LIST}
+ RUNTIME DESTINATION bin
+)

11
mathgl-2.3.5.1-fltk-skip-fluid.patch Normal file
View File

@ -0,0 +1,11 @@
diff -urp mathgl-2.3.5.1/CMakeLists.txt mathgl-2.3.5.1-fltk-skip-fluid/CMakeLists.txt
--- mathgl-2.3.5.1/CMakeLists.txt 2016-12-27 09:44:48.138478382 +0700
+++ mathgl-2.3.5.1-fltk-skip-fluid/CMakeLists.txt 2016-12-27 10:01:05.130484991 +0700
@@ -515,6 +515,7 @@ endif(enable-glut)
if(enable-fltk)
set(MGL_HAVE_FLTK 1)
+ set(FLTK_SKIP_FLUID 1)
include(FindFLTK)
if(NOT FLTK_FOUND)
message(SEND_ERROR "Couldn't find FLTK library.")

13
mathgl-2.3.5.1-no_hdf4-and-hdf5-simultaneously.patch Normal file
View File

@ -0,0 +1,13 @@
diff -urp mathgl-2.3.5.1/CMakeLists.txt mathgl-2.3.5.1-no_hdf4-and-hdf5-simultaneously/CMakeLists.txt
--- mathgl-2.3.5.1/CMakeLists.txt 2016-12-29 17:04:31.366201051 +0700
+++ mathgl-2.3.5.1-no_hdf4-and-hdf5-simultaneously/CMakeLists.txt 2016-12-29 17:45:25.155442474 +0700
@@ -143,7 +143,8 @@ CMAKE_DEPENDENT_OPTION(enable-zlib "Enab
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-hdf4 "Enable hdf4 support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON)
+SET(enable-hdf4 OFF)
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)

16
mathgl-2.3.5.1-no_qt4.patch Normal file
View File

@ -0,0 +1,16 @@
diff -urp mathgl-2.3.5.1/CMakeLists.txt mathgl-2.3.5.1-no_qt4/CMakeLists.txt
--- mathgl-2.3.5.1/CMakeLists.txt 2016-06-19 23:06:40.000000000 +0600
+++ mathgl-2.3.5.1-no_qt4/CMakeLists.txt 2016-12-29 17:04:31.366201051 +0700
@@ -150,8 +150,10 @@ CMAKE_DEPENDENT_OPTION(enable-gif "Enabl
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-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-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)
+SET(enable-qt4 OFF)
+SET(enable-qt4asqt 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)

13
mathgl-2.3.5.1-nooctave.patch Normal file
View File

@ -0,0 +1,13 @@
diff -urp mathgl-2.3.5.1/CMakeLists.txt mathgl-2.3.5.1-nooctave/CMakeLists.txt
--- mathgl-2.3.5.1/CMakeLists.txt 2016-12-29 17:45:25.155442474 +0700
+++ mathgl-2.3.5.1-nooctave/CMakeLists.txt 2017-01-09 15:44:30.045888852 +0700
@@ -183,7 +183,8 @@ endif(enable-qt4 OR enable-qt5)
CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "QT_ENABLED" OFF)
MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "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" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
+SET(enable-octave OFF)
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)

16
mathgl-2.3.5.1-nooctaveinstall.patch Normal file
View File

@ -0,0 +1,16 @@
diff -urp mathgl-2.3.5.1/lang/CMakeLists.txt mathgl-2.3.5.1-nooctaveinstall/lang/CMakeLists.txt
--- mathgl-2.3.5.1/lang/CMakeLists.txt 2016-06-19 23:01:08.000000000 +0600
+++ mathgl-2.3.5.1-nooctaveinstall/lang/CMakeLists.txt 2016-12-27 10:04:11.786000696 +0700
@@ -125,12 +125,6 @@ message(STATUS "${oct_prog} ${oct_host}
)
add_custom_target(mgl_octave_module ALL DEPENDS mathgl.tar.gz)
- install(FILES ${CMAKE_BINARY_DIR}/lang/mathgl.tar.gz DESTINATION ${MGL_DATA_PATH})
- if(enable-octave-install)
- install(CODE "execute_process(
- COMMAND ${oct_exec} -q --eval \"pkg install mathgl.tar.gz\"
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )")
- endif(enable-octave-install)
set(mgl_clean_files ${mgl_clean_files} mathgl)
endif(enable-octave)
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${mgl_clean_files}")