From: Andriy Gudz <a.gudz@samsung.com>
Date: Wed, 7 Jun 2017 11:47:14 +0000 (+0300)
Subject: Merge branch 'netagent' into iotivity-1.3.0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7ee1a61681e7bc3f1d1f7365ccbfd45fb3c0a029;p=platform%2Fcore%2Fsecurity%2Fsuspicious-activity-monitor.git

Merge branch 'netagent' into iotivity-1.3.0
---

7ee1a61681e7bc3f1d1f7365ccbfd45fb3c0a029
diff --cc device_core/utest/CMakeLists.txt
index 64fd42e,1446fd7..ee5ae50
--- a/device_core/utest/CMakeLists.txt
+++ b/device_core/utest/CMakeLists.txt
@@@ -22,10 -22,10 +22,10 @@@ add_executable (${PROJECT_NAME} ${SRCS}
  target_link_libraries(${PROJECT_NAME}
      ${GTEST_LIB}
  	pthread
- 	boost_system boost_thread
+ 	#boost_system boost_thread
          c_common oc octbstack oc_logger resource_directory connectivity_abstraction
 -        ESEnrolleeSDK
 -        #ESMediatorRich
 +		ESEnrolleeSDK
 +		ESMediatorRich
  	${CTRL_APP_LIB_PROJECT_NAME}
  	${AGENT_LIB_PROJECT_NAME}
  	jsoncpp