cmake updates

CMakeLists.txt

@@ -234,7 +234,7 @@ endif()
 
 find_package(Eigen 3.2.0 REQUIRED)
 find_package(Python 2.4 REQUIRED)
-find_package(SQLite3 REQUIRED)
+find_package(SQLite3 3.7.13 REQUIRED)
 
 if(USE_NUMPY)
   find_package(Numpy REQUIRED)
@@ -304,6 +304,7 @@ include_directories(${Boost_INCLUDE_DIRS}
                     ${TIFF_INCLUDE_DIR}
                     ${PNG_INCLUDE_DIRS}
                     ${OPEN_MM_INCLUDE_DIRS}
+                    ${SQLITE3_INCLUDE_DIRS}
                     )
 if(USE_NUMPY)
 include_directories(${PYTHON_NUMPY_INCLUDE_DIR})

cmake_support/FindSQLite3.cmake

-# Try to find SQLite3
-#
 # Once done this will define
 # - Find SQLite3
 # Find the native SQLite3 includes and library
 # 
-#  SQLITE3_INCLUDE_DIRS - SQLite3 include dirs.
-#  SQLITE3_LIBRARIES    - List of libraries when using SQLite3.
-#  SQLITE3_FOUND        - True if SQLite3 found.
+#  SQLITE3_INCLUDE_DIRS  - SQLite3 include dir.
+#  SQLITE3_LIBRARIES     - List of libraries when using SQLite3.
+#  SQLITE3_FOUND         - True if SQLite3 found.
 
-find_path(SQLITE3_INCLUDE_DIR NAMES sqlite3.h)
+find_path(SQLITE3_INCLUDE_DIR sqlite3.h)
 find_library(SQLITE3_LIBRARY NAMES sqlite3)
 
 # handle the QUIETLY and REQUIRED arguments and set SQLITE3_FOUND to TRUE if 
 # all listed variables are TRUE
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SQLITE3 DEFAULT_MSG SQLITE3_LIBRARY SQLITE3_INCLUDE_DIR)
-IF(SQLITE3_FOUND)
-	SET(SQLITE3_INCLUDE_DIRS ${SQLITE3_INCLUDE_DIR})
-	SET(SQLITE3_LIBRARIES ${SQLITE3_LIBRARY})
-ELSE(SQLITE3_FOUND)
-	SET(SQLITE3_INCLUDE_DIRS)
-	SET(SQLITE3_LIBRARIES)
-ENDIF(SQLITE3_FOUND)
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (SQLITE3 DEFAULT_MSG SQLITE3_LIBRARY SQLITE3_INCLUDE_DIR)
 
 mark_as_advanced(SQLITE3_LIBRARY SQLITE3_INCLUDE_DIR)
 
+SET(SQLITE3_INCLUDE_DIRS ${SQLITE3_INCLUDE_DIR})
+SET(SQLITE3_LIBRARIES ${SQLITE3_LIBRARY})