From: Mu-Woong Lee <muwoong.lee@samsung.com>
Date: Fri, 8 Apr 2016 06:53:27 +0000 (+0900)
Subject: Merge branch 'devel/tizen_3.0' into tizen
X-Git-Tag: submit/tizen/20160408.073002^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e5cc05149a33a420877b4ccd7da8353c8ff958ae;p=platform%2Fcore%2Fcontext%2Fcontext-provider.git

Merge branch 'devel/tizen_3.0' into tizen

* devel/tizen_3.0:
  Version 0.7.5
  Applying Tizen C++ coding style to place context provider(geofence)
  Applying Tizen C++ coding style to custom context provider
  Applying Tizen C++ coding style to device context provider
  Applying Tizen C++ coding style to provider initialization
  Build a static library, instead of a shared object
  Apply Tizen C++ coding style based on context-common changes - ContextManager, IContextManager, ContextProviderBase(context_provider_iface)
  [place-recognition] Change database asynchronous queries to synchronous.
  [place-recognition] SVACE buffer overflow warning fix.
  [place-recognition] Small SVACE defects fix.
  [place-recognition] Redundant mutex protection remove.

Change-Id: I87e7b43dab54acc63c6e5157dc4ab1381aafe5b0
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>
---

e5cc05149a33a420877b4ccd7da8353c8ff958ae
diff --cc src/device/CMakeLists.txt
index 71dc652,20276e3..f108550
--- a/src/device/CMakeLists.txt
+++ b/src/device/CMakeLists.txt
@@@ -2,12 -2,9 +2,12 @@@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6
  # prvd_cdef, prvd_deps, and prvd_srcs need to be set properly
  
  # Common Profile
- FILE(GLOB prvd_srcs ./*.cpp system/alarm.cpp system/time.cpp)
+ FILE(GLOB prvd_srcs ./*.cpp system/Alarm.cpp system/Time.cpp)
  SET(prvd_deps vconf capi-system-info capi-system-device capi-system-runtime-info)
  
 +# Common Profile
 +SET(srcs ${srcs} system/alarm.cpp system/time.cpp)
 +
  # Mobile Profile
  IF("${PROFILE}" STREQUAL "mobile")
  	SET(prvd_deps ${prvd_deps} capi-network-bluetooth capi-network-wifi)