X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=CMakeLists.txt;h=f1871366f0a2293b1fc3c0dfe5b61a1e9f4df755;hb=9ad6b8bbb1d0637f923d4705fb21d5281f98f561;hp=1069cdd613491a69dfe7b18688d70ee99777d126;hpb=c319ed7cf3cdaeeac727f4b34c26fd821445ef22;p=platform%2Fcore%2Fconnectivity%2Fnet-config.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1069cdd..f187136 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(net-config C)
+PROJECT(net-config C CXX)
 SET(PACKAGE ${PROJECT_NAME})
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(BINDIR "${PREFIX}/bin")
@@ -15,6 +15,7 @@ SET(SRCS
 	src/wifi-eap.c
 	src/wifi-wps.c
 	src/wifi-bssid-scan.c
+	src/wifi-netlink-scan.c
 	src/wifi-agent.c
 	src/wifi-power.c
 	src/wifi-state.c
@@ -24,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
@@ -31,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
@@ -55,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)
@@ -72,6 +68,11 @@ IF(TIZEN_WEARABLE)
 	ADD_DEFINITIONS(-DTIZEN_WEARABLE)
 ENDIF(TIZEN_WEARABLE)
 
+IF(TIZEN_DEBUG_ENABLE)
+	ADD_DEFINITIONS(-DTIZEN_DEBUG_ENABLE)
+	SET(SRCS ${SRCS} src/network-dump.c)
+ENDIF(TIZEN_DEBUG_ENABLE)
+
 INCLUDE(FindPkgConfig)
 PKG_CHECK_MODULES(pkgs REQUIRED
 	dlog
@@ -80,7 +81,9 @@ 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}
 	${WEARABLE_REQUIRED_PKGS}
 	)
@@ -95,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")
@@ -119,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)
@@ -131,3 +130,5 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/config/security-network-config.conf DESTINATIO
 
 ADD_SUBDIRECTORY(plugin/headed)
 ADD_SUBDIRECTORY(plugin/telephony)
+ADD_SUBDIRECTORY(haltests)
+ADD_SUBDIRECTORY(gtest)