X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=CMakeLists.txt;h=331c979dcbd6fd159b84f89f39d99c403de1c789;hb=68cac656ba0a7b549278e2c368714bcc0670f3cd;hp=960c0b1355d88b42a16ace45f1beffaa83cdfd1c;hpb=b06881867a5c236845f8e64929aaafbb23854a5d;p=platform%2Fcore%2Fconnectivity%2Fnet-config.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 960c0b1..331c979 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,8 @@ SET(SRCS
 	src/utils/util.c
 	src/vpnsvc.c
 	src/vpnsvc-internal.c
+	src/mptcp.c
+	src/mptcp-internal.c
 	src/dbus/netdbus.c
 	src/network-clock.c
 	src/network-state.c
@@ -32,6 +34,7 @@ SET(SRCS
 	src/network-monitor.c
 	src/wifi-firmware.c
 	src/wifi-indicator.c
+	src/wifi-key-encryption.c
 	src/signal-handler.c
 	src/utils/emulator.c
 	src/wifi-eap-config.c
@@ -56,14 +59,6 @@ IF(TIZEN_WLAN_USE_P2P_INTERFACE)
 	ADD_DEFINITIONS(-DTIZEN_WLAN_USE_P2P_INTERFACE)
 ENDIF(TIZEN_WLAN_USE_P2P_INTERFACE)
 
-IF(TIZEN_P2P_ENABLE)
-	ADD_DEFINITIONS(-DTIZEN_P2P_ENABLE)
-ENDIF(TIZEN_P2P_ENABLE)
-
-IF(TIZEN_TETHERING_ENABLE)
-	ADD_DEFINITIONS(-DTIZEN_TETHERING_ENABLE)
-ENDIF(TIZEN_TETHERING_ENABLE)
-
 IF(TIZEN_CAPTIVE_PORTAL)
 	ADD_DEFINITIONS(-DTIZEN_CAPTIVE_PORTAL)
 	SET(SRCS ${SRCS} src/utils/network-accessibility.c)
@@ -86,6 +81,7 @@ PKG_CHECK_MODULES(pkgs REQUIRED
 	glib-2.0
 	gio-unix-2.0
 	capi-system-info
+	key-manager
 	libtzplatform-config
 	libnl-2.0
 	${P2P_REQUIRED_PKGS}
@@ -102,10 +98,6 @@ SET(CMAKE_C_FLAGS "-I${CMAKE_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/include ${CMAKE_C
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -fPIE")
 SET(CMAKE_C_FLAGS_RELEASE "-O2 -fPIE")
 
-IF(WLAN_CONCURRENT_MODE)
-	ADD_DEFINITIONS(-DWLAN_CONCURRENT_MODE)
-ENDIF(WLAN_CONCURRENT_MODE)
-
 FIND_PROGRAM(UNAME NAMES uname)
 EXEC_PROGRAM("${UNAME}" ARGS "-m"
 OUTPUT_VARIABLE "ARCH")
@@ -126,7 +118,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-network-state.xml ${INTERFACES}/netconfig-iface-network-statistics.xml ${INTERFACES}/netconfig-iface-wifi.xml ${INTERFACES}/netconfig-iface-vpnsvc.xml ${INTERFACES}/netconfig-iface-mptcp.xml
 			COMMENT "Generating GDBus .c/.h")
 
 ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS} ${CMAKE_SOURCE_DIR}/generated-code.c)