Use iotivity.pc

Change-Id: I1be839e6bf7db0c0d913e59779611b9facb11c9d
Signed-off-by: youngman <yman.jung@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2da51bcee6020e7109417835bc54715680028a1..8a6b4c4841181b62debcd9fadb047ef3df38d646 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,12 +10,6 @@ SET(CLIENT ${PROJECT_NAME})
 SET(DAEMON "${PROJECT_NAME}-daemon")
 SET(DBUS_INTERFACE "org.tizen.${PROJECT_NAME}.dbus")
 
-SET(OCLIB "oc")
-SET(OCLOGGER "oc_logger")
-SET(OCLOGGER_CORE "oc_logger_core")
-SET(CA "connectivity_abstraction")
-SET(OCTBSTACK "octbstack")
-
 IF(NEW_SECURE)
 CONFIGURE_FILE(${PROJECT_NAME}.conf.in ${PROJECT_NAME}.conf @ONLY)
 INSTALL(FILES ${PROJECT_NAME}.conf DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d/)

diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index e75437d8f448cd845d6a7de76bf32f495c4fd5ca..b576825c8c2381da0fb63630bb7365d0b51f0a5a 100644 (file)
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -7,7 +7,15 @@ SET(DAEMON_SRCS ${DAEMON_SRCS} ${CMAKE_SOURCE_DIR}/common/ic-dbus.c)
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/common/ic-dbus.c
        PROPERTIES GENERATED TRUE)
 
-pkg_check_modules(daemon_pkgs REQUIRED gio-2.0 dlog gio-unix-2.0 capi-system-info capi-system-system-settings)
+pkg_check_modules(daemon_pkgs REQUIRED gio-2.0 dlog gio-unix-2.0 capi-system-info
+       capi-system-system-settings iotivity)
+
+FOREACH(flag ${daemon_pkgs_CFLAGS_OTHER})
+       IF(${flag} MATCHES "\\-D+")
+               ADD_DEFINITIONS(${flag})
+       ENDIF(${flag} MATCHES "\\-D+")
+ENDFOREACH(flag)
+
 INCLUDE_DIRECTORIES(${daemon_pkgs_INCLUDE_DIRS})
 LINK_DIRECTORIES(${daemon_pkgs_LIBRARY_DIRS})
 
@@ -18,13 +26,6 @@ ADD_DEFINITIONS("-DIOTCON_DBUS_INTERFACE=\"${DBUS_INTERFACE}\"")
 ADD_EXECUTABLE(${DAEMON} ${DAEMON_SRCS})
 ADD_DEPENDENCIES(${DAEMON} GENERATED_DBUS_CODE)
 
-TARGET_LINK_LIBRARIES(${DAEMON}
-       ${daemon_pkgs_LIBRARIES}
-       ${OCLIB}
-       ${OCLOGGER}
-       ${OCLOGGER_CORE}
-       ${CA}
-       ${OCTBSTACK}
-)
+TARGET_LINK_LIBRARIES(${DAEMON} ${daemon_pkgs_LIBRARIES})
 
 INSTALL(TARGETS ${DAEMON} DESTINATION ${BIN_INSTALL_DIR})

diff --git a/packaging/iotcon.spec b/packaging/iotcon.spec
index a158ba347ba15a764375c28c1da1a82e6552e03a..001837089c665bf5535a8d5918e3cb38040e50e1 100644 (file)
--- a/packaging/iotcon.spec
+++ b/packaging/iotcon.spec
@@ -13,12 +13,12 @@ Source1004: %{name}-test-old.manifest
 Source2001: %{name}.conf.in
 BuildRequires:  cmake
 BuildRequires:  boost-devel
-BuildRequires:  iotivity-devel
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(capi-system-info)
 BuildRequires:  pkgconfig(capi-system-system-settings)
+BuildRequires:  pkgconfig(iotivity)
 %if "%{tizen}" == "2.3"
 BuildRequires:  python-xml
 %endif