X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=CMakeLists.txt;h=e39e6459e620c78876aa92f616cfc88793c1dc31;hb=e1193ae69147a419052afec988a0086728ced690;hp=350148c2bf7499bef1dfb2a5330fa7ef6cb439bf;hpb=7995025de0a9956a69cc9b78d32ac182e63a649e;p=platform%2Fcore%2Fconnectivity%2Fnet-config.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 350148c..e39e645 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")
@@ -14,6 +14,8 @@ SET(SRCS
 	src/neterror.c
 	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
@@ -23,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
@@ -30,15 +34,16 @@ SET(SRCS
 	src/network-monitor.c
 	src/wifi-firmware.c
 	src/wifi-indicator.c
+	src/wifi-key-encryption.c
 	src/signal-handler.c
-	src/wifi-ssid-scan.c
 	src/utils/emulator.c
 	src/wifi-eap-config.c
 	src/network-statistics.c
 	src/dbus/netsupplicant.c
 	src/wifi-background-scan.c
-	src/wifi-tel-intf.c
 	src/wifi-config.c
+	src/wifi-extension.c
+	src/ip-conflict-detect.c
 	)
 
 IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
@@ -54,15 +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)
-	SET(P2P_REQUIRED_PKGS "capi-network-wifi-direct")
-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,16 +68,22 @@ 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
-	tapi
 	vconf
 	gio-2.0
 	glib-2.0
 	gio-unix-2.0
 	capi-system-info
+	key-manager
 	libtzplatform-config
+	libnl-2.0
 	${P2P_REQUIRED_PKGS}
 	${WEARABLE_REQUIRED_PKGS}
 	)
@@ -96,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")
@@ -120,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 +129,6 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/config/security-network-config.conf DESTINATION /usr/lib/tmpfiles.d/)
 
 ADD_SUBDIRECTORY(plugin/headed)
+ADD_SUBDIRECTORY(plugin/telephony)
+ADD_SUBDIRECTORY(unittest)
+ADD_SUBDIRECTORY(gtest)