Merge "Add dbus method for getting wifi passphrase" into tizen

[platform/core/connectivity/net-config.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bce51e7..43de6e9 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(net-config C CXX)
 SET(PACKAGE ${PROJECT_NAME})
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+SET(INCDIR "${PREFIX}/include")
 SET(BINDIR "${PREFIX}/bin")
 SET(DATADIR "${PREFIX}/share")
 SET(LIBDIR "${PREFIX}/${LIB_PATH}")
@@ -14,6 +15,7 @@ SET(SRCS
        src/neterror.c
        src/wifi-eap.c
        src/wifi-wps.c
+       src/wifi-scan.c
        src/wifi-bssid-scan.c
        src/wifi-netlink-scan.c
        src/wifi-agent.c
@@ -23,6 +25,7 @@ SET(SRCS
        src/wifi-passpoint.c
        src/utils/log.c
        src/utils/util.c
+       src/utils/setting.c
        src/vpnsvc.c
        src/vpnsvc-internal.c
        src/mptcp.c
@@ -46,6 +49,7 @@ SET(SRCS
        src/ip-conflict-detect.c
        src/clatd-handler.c
        src/wifi-dpp.c
+       src/ethernet.c
        )
 
 IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
@@ -66,6 +70,10 @@ IF(TIZEN_CAPTIVE_PORTAL)
        SET(SRCS ${SRCS} src/utils/network-accessibility.c)
 ENDIF(TIZEN_CAPTIVE_PORTAL)
 
+IF(TIZEN_ARCH_64)
+       ADD_DEFINITIONS(-DTIZEN_ARCH_64)
+ENDIF(TIZEN_ARCH_64)
+
 IF(TIZEN_WEARABLE)
        ADD_DEFINITIONS(-DTIZEN_WEARABLE)
 ENDIF(TIZEN_WEARABLE)
@@ -87,6 +95,7 @@ PKG_CHECK_MODULES(pkgs REQUIRED
        libtzplatform-config
        libnl-3.0
        libnl-genl-3.0
+       hal-api-wifi
        ${P2P_REQUIRED_PKGS}
        ${WEARABLE_REQUIRED_PKGS}
        )
@@ -121,7 +130,7 @@ ADD_CUSTOM_COMMAND(
                        --generate-c-code generated-code
                        --c-generate-object-manager
                        --generate-docbook generated-code-docs
-                       ${INTERFACES}/netconfig-iface-network-state.xml ${INTERFACES}/netconfig-iface-network-statistics.xml ${INTERFACES}/netconfig-iface-wifi.xml ${INTERFACES}/netconfig-iface-vpnsvc.xml ${INTERFACES}/netconfig-iface-mptcp.xml
+                       ${INTERFACES}/netconfig-iface-network-state.xml ${INTERFACES}/netconfig-iface-network-statistics.xml ${INTERFACES}/netconfig-iface-wifi.xml ${INTERFACES}/netconfig-iface-vpnsvc.xml ${INTERFACES}/netconfig-iface-mptcp.xml ${INTERFACES}/netconfig-iface-ethernet.xml ${INTERFACES}/netconfig-iface-clock.xml
                        COMMENT "Generating GDBus .c/.h")
 
 ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS} ${CMAKE_SOURCE_DIR}/generated-code.c)
@@ -135,6 +144,9 @@ ADD_SUBDIRECTORY(plugin/headed)
 ADD_SUBDIRECTORY(plugin/telephony)
 ADD_SUBDIRECTORY(plugin/stc)
 ADD_SUBDIRECTORY(plugin/battery)
+IF(TIZEN_ARM_ARCH)
+ADD_SUBDIRECTORY(plugin/online-monitor)
+ENDIF(TIZEN_ARM_ARCH)
 ADD_SUBDIRECTORY(haltests)
 IF(BUILD_GTESTS)
        ADD_SUBDIRECTORY(gtest)