Successful build in a clean chroot with all modules included

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d60c9fe15d0f22a84dc3ea8ec6fd0e7fc81eb2c7..f95adb440fffab3c839914948afcd0c9e236dac5 100644 (file)
--- 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 438bba3dd3f3a56594d54633fdb7e4436dfe63b6..f009e908dbacfc92fc605d4d1715538256fd6edc 100644 (file)
--- 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 4277de1289da0f79046007582058505143729fb1..031a96623e851cd68155fc5212878d97195d9f99 100644 (file)
--- 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 (file)
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 2689808adaa77cf91aa97c4db25c05b52e6821c2..e8ffe595b040ae415cc7673d42ab2af77d736ffe 100644 (file)
--- 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