[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Akonadi] c85bcf7: If using pkgconfig, use its paths to find includes
From:       Frank Osterfeld <frank () kdab ! com>
Date:       2011-01-14 12:48:38
Message-ID: 20110114124838.6C9DBA6090 () git ! kde ! org
[Download RAW message or body]

commit c85bcf7220ec95fbf8ecc16e15841e4da77d1855
branch master
Author: Frank Osterfeld <frank@kdab.com>
Date:   Sat Dec 25 20:29:38 2010 +0100

    If using pkgconfig, use its paths to find includes and libs

diff --git a/cmake/modules/FindSqlite.cmake b/cmake/modules/FindSqlite.cmake
index 5eea5a3..ba4c842 100644
--- a/cmake/modules/FindSqlite.cmake
+++ b/cmake/modules/FindSqlite.cmake
@@ -34,13 +34,27 @@ if( NOT WIN32 )
   set(SQLITE_DEFINITIONS ${PC_SQLITE_CFLAGS_OTHER})
 endif( NOT WIN32 )
 
-find_path(SQLITE_INCLUDE_DIR
-          NAMES sqlite3.h
-         )
+if(PC_SQLITE_FOUND)
+  find_path(SQLITE_INCLUDE_DIR
+            NAMES sqlite3.h
+            PATHS ${PC_SQLITE_INCLUDEDIR}
+            NO_DEFAULT_PATH
+           )
+
+  find_library(SQLITE_LIBRARIES
+               NAMES sqlite3
+               PATHS ${PC_SQLITE_LIBDIR}
+               NO_DEFAULT_PATH
+              )
+else(PC_SQLITE_FOUND)
+  find_path(SQLITE_INCLUDE_DIR
+            NAMES sqlite3.h
+           )
 
-find_library(SQLITE_LIBRARIES
-             NAMES sqlite3
-            )
+  find_library(SQLITE_LIBRARIES
+               NAMES sqlite3
+              )
+endif(PC_SQLITE_FOUND)
 
 if( UNIX )
   find_file(SQLITE_STATIC_LIBRARIES
[prev in list] [next in list] [prev in thread] [next in thread]