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

Add patches to repo

This commit is contained in:
Dmitrij S. Kryzhevich 2014-01-16 12:34:32 +07:00
parent 06ab450749
commit 2fc8359baf
4 changed files with 85 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mathgl-2.2-disable-lib-installdir.patch Normal file
View File

@ -0,0 +1,11 @@
--- CMakeLists.txt 2013-12-27 17:31:25.416802089 +0700
+++ CMakeLists.txt-disable-lib-installdir 2013-12-27 17:33:39.149918844 +0700
@@ -56,7 +56,7 @@
ENDMACRO(MGL_DEPENDENT_OPTION)
include(CMakeDependentOption)
-set(MGL_LIB_INSTALL_DIR "lib" CACHE STRING "Set library install directory")
+#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")

41
mathgl-2.2-examples.patch Normal file
View File

@ -0,0 +1,41 @@
diff -urp mathgl-2.2/examples/CMakeLists.txt mathgl-2.2-examples/examples/CMakeLists.txt
--- mathgl-2.2/examples/CMakeLists.txt 2013-11-11 17:46:38.000000000 +0700
+++ mathgl-2.2-examples/examples/CMakeLists.txt 2013-12-27 17:38:02.816195817 +0700
@@ -4,22 +4,26 @@ endif(MGL_HAVE_GSL)
add_executable(mgl_example wnd_samples.cpp full_test.cpp samples.cpp)
target_link_libraries(mgl_example mgl)
+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(MGL_HAVE_QT)
@@ -27,4 +31,10 @@ if(MGL_HAVE_QT)
# qt_wrap_cpp(mgl_qt_example MGL_MOC_EX_FILES ../include/mgl2/qt.h)
add_executable(mgl_qt_example wnd_samples.cpp qt_example.cpp ${MGL_MOC_EX_FILES})
target_link_libraries(mgl_qt_example mgl-qt)
+ SET(MGL_INSTALL_EXAMPLES_LIST ${MGL_INSTALL_EXAMPLES_LIST} mgl_qt_example)
endif(MGL_HAVE_QT)
+
+install(
+ TARGETS ${MGL_INSTALL_EXAMPLES_LIST}
+ RUNTIME DESTINATION bin
+)

10
mathgl-2.2-fltk-skip-fluid.patch Normal file
View File

@ -0,0 +1,10 @@
--- CMakeLists.txt 2013-12-27 17:25:13.937026671 +0700
+++ CMakeLists.txt-fltk-skip-fluid 2013-12-27 17:31:25.416802089 +0700
@@ -327,6 +327,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.")

23
mathgl-2.2-no-hdf4-and-hdf5-simultaneously.patch Normal file
View File

@ -0,0 +1,23 @@
--- CMakeLists.txt 2013-12-27 17:24:33.553596153 +0700
+++ CMakeLists.txt-no-hdf4-and-hdf5-simultaneously 2013-12-27 17:25:13.937026671 +0700
@@ -215,7 +215,7 @@ endif(enable-gsl)
# set(MGL_HAVE_LTDL 0)
#endif(enable-all OR enable-ltdl)
-if(enable-hdf4)
+if(enable-hdf4 AND (NOT enable-hdf5))
set(MGL_HAVE_HDF4 1)
find_library(HDF4_LIB df)
find_library(HDF4MF_LIB mfhdf)
@@ -226,9 +226,9 @@ if(enable-hdf4)
message(SEND_ERROR "${HDF4_INCLUDE_DIR}")
message(SEND_ERROR "Couldn't find HDF4 libraries.")
endif(NOT HDF4_LIB OR NOT HDF4MF_LIB OR NOT HDF4_INCLUDE_DIR)
-else(enable-hdf4)
+else(enable-hdf4 AND (NOT enable-hdf5))
set(MGL_HAVE_HDF4 0)
-endif(enable-hdf4)
+endif(enable-hdf4 AND (NOT enable-hdf5))
if(enable-hdf5)
set(MGL_HAVE_HDF5 1)