[ossim-plugins] 05/05: Use pkg-config for sqlite3.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository ossim-plugins.

commit f894ef76abf7f011c39e1ca6c16ab9fcba04d5c8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat May 28 18:24:46 2016 +0200

    Use pkg-config for sqlite3.
---
 debian/patches/sqlite.patch | 34 +++++++++++++---------------------
 debian/rules                |  4 +---
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/debian/patches/sqlite.patch b/debian/patches/sqlite.patch
index 266d706..9c267c3 100644
--- a/debian/patches/sqlite.patch
+++ b/debian/patches/sqlite.patch
@@ -1,29 +1,21 @@
-Description: Add support to manually specify SQLite library and include dirs.
+Description: Use pkg-config for sqlite3.
 Author: Bas Couwenberg <sebastic at debian.org>
 
 --- a/ossim_plugins/sqlite/CMakeLists.txt
 +++ b/ossim_plugins/sqlite/CMakeLists.txt
-@@ -11,13 +11,18 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOUR
+@@ -11,10 +11,12 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOUR
  set(requiredLibs)
  
  # SQLite - Required:
 -find_package(SQLITE)
--if(SQLITE_FOUND)
-+IF(SQLITE_INCLUDE_DIR AND SQLITE_LIBRARY)
-    include_directories( ${SQLITE_INCLUDE_DIR} )
-    SET(requiredLibs ${requiredLibs} ${SQLITE_LIBRARY})
--else(SQLITE_FOUND)
--   message(FATAL_ERROR "Could not find sqlite")
--endif(SQLITE_FOUND)
-+ELSE(SQLITE_INCLUDE_DIR AND SQLITE_LIBRARY)
-+   find_package(SQLITE)
-+   if(SQLITE_FOUND)
-+      include_directories( ${SQLITE_INCLUDE_DIR} )
-+      SET(requiredLibs ${requiredLibs} ${SQLITE_LIBRARY})
-+   else(SQLITE_FOUND)
-+      message(FATAL_ERROR "Could not find sqlite")
-+   endif(SQLITE_FOUND)
-+ENDIF(SQLITE_INCLUDE_DIR AND SQLITE_LIBRARY)
- 
- # PNG - Required:
- find_package(PNG)
++include(FindPkgConfig)
++pkg_search_module(SQLITE sqlite3)
++
+ if(SQLITE_FOUND)
+-   include_directories( ${SQLITE_INCLUDE_DIR} )
+-   SET(requiredLibs ${requiredLibs} ${SQLITE_LIBRARY})
++   include_directories( ${SQLITE_INCLUDE_DIRS} )
++   SET(requiredLibs ${requiredLibs} ${SQLITE_LIBRARIES})
+ else(SQLITE_FOUND)
+    message(FATAL_ERROR "Could not find sqlite")
+ endif(SQLITE_FOUND)
diff --git a/debian/rules b/debian/rules
index 33772a2..05dfb12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,9 +27,7 @@ CMAKE_OPTS = \
        -DBUILD_OSSIMWEB_PLUGIN=ON \
        -DBUILD_SHARED_LIBS=ON \
        -DPODOFO_INCLUDE_DIR=/usr/include/podofo \
-       -DPODOFO_LIBRARY=/usr/lib/libpodofo.so \
-       -DSQLITE_INCLUDE_DIR=/usr/include \
-       -DSQLITE_LIBRARY=/usr/lib/$(DEB_HOST_MULTIARCH)/libsqlite3.so
+       -DPODOFO_LIBRARY=/usr/lib/libpodofo.so
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(CMAKE_OPTS)

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