Merge branch 'netagent' into iotivity-1.3.0
authorAndriy Gudz <a.gudz@samsung.com>
Wed, 7 Jun 2017 11:47:14 +0000 (14:47 +0300)
committerAndriy Gudz <a.gudz@samsung.com>
Wed, 7 Jun 2017 11:47:14 +0000 (14:47 +0300)
1  2 
device_core/secserver/notification_resource.cpp
device_core/secserver/policy_resource.cpp
device_core/secserver/report_resource.cpp
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