[qmapshack] 06/09: Add patch to tweak FindALGLIB.cmake for Debian package.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository qmapshack.

commit 6fe85a40dca135fbdb46e21514165e092aa8d892
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Dec 13 18:13:23 2016 +0100

    Add patch to tweak FindALGLIB.cmake for Debian package.
---
 debian/changelog                                   |  1 +
 debian/patches/alglib.patch                        | 14 ++++++++++
 .../cmake-patch-to-find-alglib-on-RH-systems.patch | 32 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 4 files changed, 49 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ff03248..2607e75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qmapshack (1.7.2-1) UNRELEASED; urgency=medium
   * Disable icon regeneration on mips64el, inkscape fails there too.
   * Add libalglib-dev to build dependencies.
   * Add license & copyright for alglib.
+  * Add patch to tweak FindALGLIB.cmake for Debian package.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 13 Dec 2016 17:04:24 +0100
 
diff --git a/debian/patches/alglib.patch b/debian/patches/alglib.patch
new file mode 100644
index 0000000..24d3d74
--- /dev/null
+++ b/debian/patches/alglib.patch
@@ -0,0 +1,14 @@
+Description: Tweak FindALGLIB.cmake for Debian package.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/cmake/Modules/FindALGLIB.cmake
++++ b/cmake/Modules/FindALGLIB.cmake
+@@ -30,7 +30,7 @@ else (ALGLIB_LIBRARIES AND ALGLIB_INCLUD
+         ${CMAKE_INSTALL_PREFIX}/include
+     PATH_SUFFIXES
+         alglib
+-
++        libalglib
+   )
+   mark_as_advanced(ALGLIB_INCLUDE_DIR)
+ 
diff --git a/debian/patches/cmake-patch-to-find-alglib-on-RH-systems.patch b/debian/patches/cmake-patch-to-find-alglib-on-RH-systems.patch
new file mode 100644
index 0000000..c56f606
--- /dev/null
+++ b/debian/patches/cmake-patch-to-find-alglib-on-RH-systems.patch
@@ -0,0 +1,32 @@
+Description: Cmake patch to find alglib on RH systems
+Author: Oliver Eichler <oliver.eichler at gmx.de>
+Origin: https://bitbucket.org/maproom/qmapshack/commits/240e7a2a21ba06fccc2420be36cc25f8781378ec
+
+--- a/cmake/Modules/FindALGLIB.cmake
++++ b/cmake/Modules/FindALGLIB.cmake
+@@ -36,8 +36,9 @@ else (ALGLIB_LIBRARIES AND ALGLIB_INCLUD
+ 
+   find_library(ALGLIB_LIBRARY
+     NAMES
+-        alg
++        alglib
+     PATHS
++        /usr/lib64
+         /usr/lib
+         /usr/local/lib
+         /opt/local/lib
+@@ -50,11 +51,9 @@ else (ALGLIB_LIBRARIES AND ALGLIB_INCLUD
+     ${ALGLIB_INCLUDE_DIR}
+   )
+ 
+-  if (ALGLIB_FOUND)
+-    set(ALGLIB_LIBRARIES
+-      ${ALGLIB_LIBRARY}
+-    )
+-  endif (ALGLIB_FOUND)
++  set(ALGLIB_LIBRARIES
++    ${ALGLIB_LIBRARY}
++  )
+ 
+   if (ALGLIB_INCLUDE_DIRS AND ALGLIB_LIBRARIES)
+      set(ALGLIB_FOUND TRUE)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..59ab622
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+cmake-patch-to-find-alglib-on-RH-systems.patch
+alglib.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git