[SCM] Packaging for mathgl branch, experimental, updated. debian/2_rc2+svn364-1-7-gc519531
Dimitrios Eftaxiopoulos
eftaxi12 at otenet.gr
Sat Mar 17 20:51:28 UTC 2012
The following commit has been merged in the experimental branch:
commit c5195312e921bf68dc6263c40dd01e6a94f6ea30
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Sat Mar 17 22:48:45 2012 +0200
Successful build in a clean chroot with all modules included
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d60c9fe..f95adb4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ project( MathGL )
set(CMAKE_VERBOSE_MAKEFILE ON)
option(enable-double "Enable double precision in MathGL library" ON)
option(enable-all "Enable all features")
-option(enable-langall "Enable all language interfaces" ON)
+option(enable-langall "Enable all language interfaces")
option(enable-lgpl "Enable only LGPL part of MathGL" OFF)
option(enable-ltdl "Enable loading modules support" ON)
option(enable-pthread "Enable POSIX threads support" ON)
@@ -14,7 +14,7 @@ option(enable-u3d "Enable u3d support")
option(enable-pdf "Enable pdf support")
option(enable-gif "Enable gif support" ON)
option(enable-hdf4 "Enable hdf4 support" ON)
-option(enable-hdf5 "Enable hdf5 1.6 support")
+option(enable-hdf5 "Enable hdf5 1.6 support" ON)
option(enable-hdf5_18 "Enable hdf5 1.8 support" ON)
option(enable-opengl "Enable OpenGL support" ON)
option(enable-glut "Enable glut support" ON)
diff --git a/debian/patches/CMakeLists-txt.patch b/debian/patches/CMakeLists-txt.patch
index 438bba3..f009e90 100644
--- a/debian/patches/CMakeLists-txt.patch
+++ b/debian/patches/CMakeLists-txt.patch
@@ -7,8 +7,7 @@
-option(enable-double "Enable double precision in MathGL library")
+option(enable-double "Enable double precision in MathGL library" ON)
option(enable-all "Enable all features")
--option(enable-langall "Enable all language interfaces")
-+option(enable-langall "Enable all language interfaces" ON)
+ option(enable-langall "Enable all language interfaces")
option(enable-lgpl "Enable only LGPL part of MathGL" OFF)
-option(enable-ltdl "Enable loading modules support")
-option(enable-pthread "Enable POSIX threads support")
@@ -22,10 +21,11 @@
option(enable-pdf "Enable pdf support")
-option(enable-gif "Enable gif support")
-option(enable-hdf4 "Enable hdf4 support")
+-option(enable-hdf5 "Enable hdf5 1.6 support")
+-option(enable-hdf5_18 "Enable hdf5 1.8 support")
+option(enable-gif "Enable gif support" ON)
+option(enable-hdf4 "Enable hdf4 support" ON)
- option(enable-hdf5 "Enable hdf5 1.6 support")
--option(enable-hdf5_18 "Enable hdf5 1.8 support")
++option(enable-hdf5 "Enable hdf5 1.6 support" ON)
+option(enable-hdf5_18 "Enable hdf5 1.8 support" ON)
option(enable-opengl "Enable OpenGL support" ON)
-option(enable-glut "Enable glut support")
diff --git a/debian/patches/series b/debian/patches/series
index 4277de1..031a966 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
CMakeLists-txt.patch
+texinfo-CMakeLists-txt.patch
diff --git a/debian/patches/texinfo-CMakeLists-txt.patch b/debian/patches/texinfo-CMakeLists-txt.patch
new file mode 100644
index 0000000..87e311f
--- /dev/null
+++ b/debian/patches/texinfo-CMakeLists-txt.patch
@@ -0,0 +1,11 @@
+--- a/texinfo/CMakeLists.txt
++++ b/texinfo/CMakeLists.txt
+@@ -4,7 +4,7 @@
+
+ if(MGL_HAVE_DOC)
+ add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/texinfo/png/all.png
+- COMMAND LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/mgl ${CMAKE_BINARY_DIR}/examples/mgl_example
++ COMMAND ${CMAKE_BINARY_DIR}/examples/mgl_example
+ COMMAND touch ${CMAKE_SOURCE_DIR}/texinfo/png/all.png
+ # MAIN_DEPENDENCY ${CMAKE_BINARY_DIR}/examples/mgl_example
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/texinfo/png
diff --git a/texinfo/CMakeLists.txt b/texinfo/CMakeLists.txt
index 2689808..e8ffe59 100644
--- a/texinfo/CMakeLists.txt
+++ b/texinfo/CMakeLists.txt
@@ -4,7 +4,7 @@
if(MGL_HAVE_DOC)
add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/texinfo/png/all.png
- COMMAND LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/mgl ${CMAKE_BINARY_DIR}/examples/mgl_example
+ COMMAND ${CMAKE_BINARY_DIR}/examples/mgl_example
COMMAND touch ${CMAKE_SOURCE_DIR}/texinfo/png/all.png
# MAIN_DEPENDENCY ${CMAKE_BINARY_DIR}/examples/mgl_example
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/texinfo/png
--
Packaging for mathgl
More information about the debian-science-commits
mailing list