X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=CMakeLists.txt;h=550702a983d60f7687ef9c4af9e7fab17487b103;hb=refs%2Fheads%2Fsandbox%2Fnmerinov%2Fllvm;hp=c7e44a0905a8b4589e9b83893d929ad89eaaae52;hpb=0dbad86236d3cdec837d9cd74ae170c9b0bc2ee8;p=platform%2Fcore%2Fconnectivity%2Fnet-config.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7e44a0..550702a 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")
@@ -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
@@ -57,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)
@@ -100,14 +94,10 @@ ENDFOREACH(flag)
 
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -Wall -Werror -fvisibility=hidden")
 SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} -Wall -Werror -fvisibility=hidden -fvisibility-inlines-hidden")
-SET(CMAKE_C_FLAGS "-I${CMAKE_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/include ${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIE")
+SET(CMAKE_C_FLAGS "-I${CMAKE_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/include ${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIE -D_GNU_SOURCE")
 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")
@@ -128,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)
@@ -140,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)