Fix build error and change CMakefile

Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18c51207d7554a50ae2e1ec26850e5879e9ccd73..a287a52a994fdd20cbb2fbde529cecfcc554d634 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,45 +1,11 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(d2d-manager-daemon C CXX)
 
 MESSAGE("===================================================================")
 MESSAGE("Building...d2d-manager")
 MESSAGE("===================================================================")
 
-MESSAGE(" - Set include folder")
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/util)
-
-MESSAGE(" - Set source folder")
-AUX_SOURCE_DIRECTORY(${CMAKE_SOURCE_DIR}/src/subownerclient SRCS)
-
-MESSAGE(" - Checking...packages dependency")
-INCLUDE(FindPkgConfig)
-
-SET(PKG_MODULES glib-2.0 gio-2.0 gio-unix-2.0 dlog dbus-1 iotivity uuid)
-
-MESSAGE(" - Adding external C flags")
-FOREACH(flag ${daemon_pkgs_CFLAGS})
-    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-    SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-#SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fpic -Werror -Wextra -Wall -Wdeclaration-after-statement -Wmissing-declarations -Wredundant-decls -Wcast-align -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable")
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fpic")
-#SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} -std=gnu++11 -fPIC -Wall -Werror-implicit-function-declaration -fvisibility=hidden")
-SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} -std=gnu++11 -fPIC -fvisibility=hidden")
-
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
-
-#Address-Space Layout Randomization
-MESSAGE(" - Address-Space Layout Randomizations")
-SET(CMAKE_C_FLAGS_DEBUG "-fPIE")
-SET(CMAKE_C_FLAGS_RELEASE "-fPIE")
-
-ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
-ADD_DEFINITIONS("-DUSE_DLOG")
-ADD_DEFINITIONS("-DTIZEN_DEBUG_ENABLE")
-
-ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} pthread)
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
+SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+SET(LIBDIR "${PREFIX}/lib")
 
+ADD_SUBDIRECTORY(src/subownerclient)
 ADD_SUBDIRECTORY(test)

diff --git a/packaging/d2d-manager.spec b/packaging/d2d-manager.spec
index ae3a9eef26ce8c4fe011add46e1af0de7213b522..9fb6e3d50928178db0db1596569c7401b7779b48 100644 (file)
--- a/packaging/d2d-manager.spec
+++ b/packaging/d2d-manager.spec
@@ -22,6 +22,8 @@ BuildRequires: pkgconfig(json-glib-1.0)
 BuildRequires: pkgconfig(uuid)
 BuildRequires: pkgconfig(capi-base-common)
 BuildRequires: pkgconfig(libtzplatform-config)
+BuildRequires: pkgconfig(aul)
+BuildRequires: pkgconfig(gmock)
 
 %description
 D2D Manager

diff --git a/src/subownerclient/CMakeLists.txt b/src/subownerclient/CMakeLists.txt
new file mode 100644 (file)
index 0000000..ccc4e73
--- /dev/null
+++ b/src/subownerclient/CMakeLists.txt
@@ -0,0 +1,24 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+PROJECT(d2d-manager-daemon C CXX)
+
+FILE(GLOB SRCS *)
+
+include_directories(${CMAKE_SOURCE_DIR}/src/subownerclient)
+include_directories(${CMAKE_SOURCE_DIR}/src/subownerclient/include)
+
+INCLUDE(FindPkgConfig)
+pkg_check_modules(subownerclient_pkgs REQUIRED glib-2.0 gio-2.0 gio-unix-2.0 dlog dbus-1 iotivity uuid gmock aul)
+
+MESSAGE(" - Adding external C flags")
+FOREACH(flag ${subownerclient_pkgs_CFLAGS})
+        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+       SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fpic")
+SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} -std=gnu++11 -fPIC -fvisibility=hidden")
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
+
+ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${subownerclient_pkgs_LDFLAGS})
+INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)

diff --git a/src/subownerclient/main.c b/src/subownerclient/main.c
index 604677f02d99b7a2a7688ccf18b70c0356f43281..eb6415dd4a94ddb593f6522c4c13aa692464238c 100755 (executable)
--- a/src/subownerclient/main.c
+++ b/src/subownerclient/main.c
@@ -16,9 +16,18 @@
 
 #include <stdio.h>
 #include <stdint.h>
+#include <dlog.h>
+#include <aul.h>
 #include <glib.h>
 
 int main()
 {
+       int ret;
+
+       dlog_print(DLOG_DEBUG, "D2D_DAEMON", "run daemon");
+
+       ret = aul_launch_app("org.tizen.familynet-manager", NULL);
+       dlog_print(DLOG_DEBUG, "D2D_DAEMON", "launch app result : %d", ret);
+
        return 0;
 }