From a7c5d752cb75485baa0ded5226335d0f8eb10321 Mon Sep 17 00:00:00 2001 From: Justin Dickow Date: Fri, 20 Feb 2015 09:11:18 -0500 Subject: Bug Fixes and Improvements Fix Empty perform iteration request Fix type of name from string to enum SendLocation implemented on HTML5 HMI Fixed PI response on VR rejection due to high priority. Fix Apps not responsive/not able to start app/apps remain listed on SYNC even after USB disconnect Mobile API change and processing capabilities Change perform interaction request conditions. Fix SDL must always start 3sec timer before resuming the HMILevel of the app Remove redundant StartSavePersistentDataTimer() call. Change wrong predicate name to right. Added stream request handling feature Made streaming timeout in media manager configurable Put navi app in LIMITED in case of phone call Handling of audio state for applications Add stop streaming timeout into ini file Implement HMILevel resumption for job-1 Fix result code ABORTED when interrupts it by Voice recognition activation Fix incorrect value parameter unexpectedDisconnect in BCOnAppUnregistered Fix SDL send BC.OnAppUnregistered with "unexpectedDisconnect" set to "true" in case received from HMI OnExitAllApplications {"reason":"MASTER_RESET"} Fix Update ini file for iAP1 support Current working directory added to image path Fix helpers to make it workable with more then 2 parameters DCHECK() for ManageMobileCommand() replaced with log message because the latter returns false in some regular situations (e.g. TOO_MANY_PENDING_REQUESTS, see SDLAQ-CRS-10) Remove connection after closing. Signed-off-by: Justin Dickow --- cmake/Modules/FindSqlite3.cmake | 125 +++++++++++++++++++++++++--------------- 1 file changed, 79 insertions(+), 46 deletions(-) (limited to 'cmake') diff --git a/cmake/Modules/FindSqlite3.cmake b/cmake/Modules/FindSqlite3.cmake index 80d40733c6..514ff0b7f9 100644 --- a/cmake/Modules/FindSqlite3.cmake +++ b/cmake/Modules/FindSqlite3.cmake @@ -1,48 +1,81 @@ -# - find Sqlite 3 -# SQLITE3_INCLUDE_DIR - Where to find Sqlite 3 header files (directory) -# SQLITE3_LIBRARIES - Sqlite 3 libraries -# SQLITE3_LIBRARY_RELEASE - Where the release library is -# SQLITE3_LIBRARY_DEBUG - Where the debug library is -# SQLITE3_FOUND - Set to TRUE if we found everything (library, includes and executable) -# Copyright (c) 2010 Pau Garcia i Quiles, +# - Try to find Sqlite3 +# Once done this will define # -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# SQLITE3_FOUND - system has Sqlite3 +# SQLITE3_INCLUDE_DIRS - the Sqlite3 include directory +# SQLITE3_LIBRARIES - Link these to use Sqlite3 +# SQLITE3_DEFINITIONS - Compiler switches required for using Sqlite3 # -# Generated by CModuler, a CMake Module Generator - http://gitorious.org/cmoduler -IF( SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY_RELEASE AND SQLITE3_LIBRARY_DEBUG ) - SET(SQLITE3_FIND_QUIETLY TRUE) -ENDIF( SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY_RELEASE AND SQLITE3_LIBRARY_DEBUG ) -FIND_PATH( SQLITE3_INCLUDE_DIR sqlite3.h ) -FIND_LIBRARY(SQLITE3_LIBRARY_RELEASE NAMES sqlite3 ) -FIND_LIBRARY(SQLITE3_LIBRARY_DEBUG NAMES sqlite3 sqlite3d HINTS /usr/lib/debug/usr/lib/ ) -IF( SQLITE3_LIBRARY_RELEASE OR SQLITE3_LIBRARY_DEBUG AND SQLITE3_INCLUDE_DIR ) - SET( SQLITE3_FOUND TRUE ) -ENDIF( SQLITE3_LIBRARY_RELEASE OR SQLITE3_LIBRARY_DEBUG AND SQLITE3_INCLUDE_DIR ) -IF( SQLITE3_LIBRARY_DEBUG AND SQLITE3_LIBRARY_RELEASE ) -# if the generator supports configuration types then set -# optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value - IF( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE ) - SET( SQLITE3_LIBRARIES optimized ${SQLITE3_LIBRARY_RELEASE} debug ${SQLITE3_LIBRARY_DEBUG} ) - ELSE( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE ) - # if there are no configuration types and CMAKE_BUILD_TYPE has no value - # then just use the release libraries - SET( SQLITE3_LIBRARIES ${SQLITE3_LIBRARY_RELEASE} ) - ENDIF( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE ) -ELSEIF( SQLITE3_LIBRARY_RELEASE ) - SET( SQLITE3_LIBRARIES ${SQLITE3_LIBRARY_RELEASE} ) -ELSE( SQLITE3_LIBRARY_DEBUG AND SQLITE3_LIBRARY_RELEASE ) - SET( SQLITE3_LIBRARIES ${SQLITE3_LIBRARY_DEBUG} ) -ENDIF( SQLITE3_LIBRARY_DEBUG AND SQLITE3_LIBRARY_RELEASE ) -IF( SQLITE3_FOUND ) - IF( NOT SQLITE3_FIND_QUIETLY ) - MESSAGE( STATUS "Found Sqlite3 header file in ${SQLITE3_INCLUDE_DIR}") - MESSAGE( STATUS "Found Sqlite3 libraries: ${SQLITE3_LIBRARIES}") - ENDIF( NOT SQLITE3_FIND_QUIETLY ) -ELSE(SQLITE3_FOUND) - IF( SQLITE3_FIND_REQUIRED) - MESSAGE( FATAL_ERROR "Could not find Sqlite3" ) - ELSE( SQLITE3_FIND_REQUIRED) - MESSAGE( STATUS "Optional package Sqlite3 was not found" ) - ENDIF( SQLITE3_FIND_REQUIRED) -ENDIF(SQLITE3_FOUND) \ No newline at end of file +# Copyright (c) 2008 Andreas Schneider +# +# Redistribution and use is allowed according to the terms of the New +# BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# + + +if (SQLITE3_LIBRARIES AND SQLITE3_INCLUDE_DIRS) + set(SQLITE3_FOUND TRUE) +else (SQLITE3_LIBRARIES AND SQLITE3_INCLUDE_DIRS) + find_package(PkgConfig) + if (PKG_CONFIG_FOUND) + pkg_check_modules(_SQLITE3 REQUIRED sqlite3>=3.7.11) + else (PKG_CONFIG_FOUND) + message(WARNING "PkgConfig isn't installed. You need to sure sqlite3>=3.7.11") + endif (PKG_CONFIG_FOUND) + + find_path(SQLITE3_INCLUDE_DIR + NAMES + sqlite3.h + PATHS + ${_SQLITE3_INCLUDEDIR} + /usr/include + /usr/local/include + /opt/local/include + /sw/include + ) + + find_library(SQLITE3_LIBRARY + NAMES + sqlite3 + PATHS + ${_SQLITE3_LIBDIR} + /usr/lib + /usr/local/lib + /opt/local/lib + /sw/lib + ) + + if (SQLITE3_LIBRARY) + set(SQLITE3_FOUND TRUE) + endif (SQLITE3_LIBRARY) + + set(SQLITE3_INCLUDE_DIRS + ${SQLITE3_INCLUDE_DIR} + ) + + if (SQLITE3_FOUND) + set(SQLITE3_LIBRARIES + ${SQLITE3_LIBRARIES} + ${SQLITE3_LIBRARY} + ) + endif (SQLITE3_FOUND) + + if (SQLITE3_INCLUDE_DIRS AND SQLITE3_LIBRARIES) + set(SQLITE3_FOUND TRUE) + endif (SQLITE3_INCLUDE_DIRS AND SQLITE3_LIBRARIES) + + if (SQLITE3_FOUND) + if (NOT Sqlite3_FIND_QUIETLY) + message(STATUS "Found Sqlite3: ${SQLITE3_LIBRARIES}") + endif (NOT Sqlite3_FIND_QUIETLY) + else (SQLITE3_FOUND) + if (Sqlite3_FIND_REQUIRED) + message(FATAL_ERROR "Could not find Sqlite3") + endif (Sqlite3_FIND_REQUIRED) + endif (SQLITE3_FOUND) + + # show the SQLITE3_INCLUDE_DIRS and SQLITE3_LIBRARIES variables only in the advanced view + mark_as_advanced(SQLITE3_INCLUDE_DIRS SQLITE3_LIBRARIES) + +endif (SQLITE3_LIBRARIES AND SQLITE3_INCLUDE_DIRS) \ No newline at end of file -- cgit v1.2.1