Convert it

svn path=/trunk/KDE/kdelibs/; revision=882079

1 files changed, 39 insertions, 37 deletions

diff --git a/modules/FindSqlite.cmake b/modules/FindSqlite.cmake
index 96f32929..29a23612 100644
--- a/modules/FindSqlite.cmake
+++ b/modules/FindSqlite.cmake
@@ -1,41 +1,43 @@
-# - Try to find the SQLITE library
+# - Try to find Sqlite
 # Once done this will define
 #
-#  SQLITE_FOUND - system has sqlite
-#  SQLITE_INCLUDE_DIR - the sqlite include directory
-#  SQLITE_LIBRARIES - Link these to use sqlite
-#  SQLITE_DEFINITIONS - Compiler switches required for using sqlite
+#  SQLITE_FOUND - system has Sqlite
+#  SQLITE_INCLUDE_DIR - the Sqlite include directory
+#  SQLITE_LIBRARIES - Link these to use Sqlite
+#  SQLITE_DEFINITIONS - Compiler switches required for using Sqlite
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 #
 
-if (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
-
-  # in cache already
-  SET(SQLITE_FOUND TRUE)
-
-else (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
-  IF (NOT WIN32)
-    # use pkg-config to get the directories and then use these values
-    # in the FIND_PATH() and FIND_LIBRARY() calls
-    INCLUDE(UsePkgConfig)
-  
-    PKGCONFIG(sqlite3 _SQLITEIncDir _SQLITELinkDir _SQLITELinkFlags _SQLITECflags)
-  
-    set(SQLITE_DEFINITIONS ${_SQLITECflags})
-  ENDIF (NOT WIN32)
-
-  FIND_PATH(SQLITE_INCLUDE_DIR sqlite3.h
-    ${_SQLITEIncDir}
-  )
-  
-  FIND_LIBRARY(SQLITE_LIBRARIES NAMES sqlite3
-    PATHS
-    ${_SQLITELinkDir}
-  )
- 
-  
-  include(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sqlite DEFAULT_MSG SQLITE_INCLUDE_DIR SQLITE_LIBRARIES )
-  
-  MARK_AS_ADVANCED(SQLITE_INCLUDE_DIR SQLITE_LIBRARIES)
-  
-endif (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
+
+if ( SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES )
+   # in cache already
+   SET(Sqlite_FIND_QUIETLY TRUE)
+endif ( SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES )
+
+# use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+if( NOT WIN32 )
+  INCLUDE(FindPkgConfig)
+
+  PKG_CHECK_MODULES(SQLITE sqlite3)
+
+  SET(SQLITE_DEFINITIONS ${SQLITE_CFLAGS})
+endif( NOT WIN32 )
+
+FIND_PATH(SQLITE_INCLUDE_DIR NAMES sqlite3.h
+  PATHS
+  ${SQLITE_INCLUDE_DIRS}
+)
+
+FIND_LIBRARY(SQLITE_LIBRARIES NAMES sqlite3
+  PATHS
+  ${SQLITE_LIBRARY_DIRS}
+)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sqlite DEFAULT_MSG SQLITE_INCLUDE_DIR SQLITE_LIBRARIES )
+
+# show the SQLITE_INCLUDE_DIR and SQLITE_LIBRARIES variables only in the advanced view
+MARK_AS_ADVANCED(SQLITE_INCLUDE_DIR SQLITE_LIBRARIES )
+