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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c65574..550702a 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,10 @@
 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}/sbin")
+SET(BINDIR "${PREFIX}/bin")
 SET(DATADIR "${PREFIX}/share")
-SET(LIBDIR "${PREFIX}/lib")
+SET(LIBDIR "${PREFIX}/${LIB_PATH}")
 SET(INTERFACES "${CMAKE_SOURCE_DIR}/interfaces")
 
 SET(SRCS
@@ -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,54 +59,31 @@ 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)
 ENDIF(TIZEN_CAPTIVE_PORTAL)
 
-IF(TIZEN_TV)
-       ADD_DEFINITIONS(-DTIZEN_TV)
-ENDIF(TIZEN_TV)
-
 IF(TIZEN_WEARABLE)
 	ADD_DEFINITIONS(-DTIZEN_WEARABLE)
 ENDIF(TIZEN_WEARABLE)
 
-IF(TIZEN_TELEPHONY_ENABLE)
-	ADD_DEFINITIONS(-DTIZEN_TELEPHONY_ENABLE)
-ENDIF(TIZEN_TELEPHONY_ENABLE)
-
-IF(TIZEN_NTP_ENABLE)
-	ADD_DEFINITIONS(-DTIZEN_NTP_ENABLE)
-ENDIF(TIZEN_NTP_ENABLE)
-
-IF(TIZEN_WLAN_BOARD_SPRD)
-	ADD_DEFINITIONS(-DTIZEN_WLAN_BOARD_SPRD)
-ENDIF(TIZEN_WLAN_BOARD_SPRD)
+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
-	bundle
 	gio-2.0
 	glib-2.0
 	gio-unix-2.0
-	eventsystem
-	alarm-service
-	syspopup-caller
 	capi-system-info
-	capi-appfw-application
+	key-manager
+	libtzplatform-config
+	libnl-2.0
 	${P2P_REQUIRED_PKGS}
 	${WEARABLE_REQUIRED_PKGS}
 	)
@@ -112,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")
@@ -140,11 +118,17 @@ 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)
 
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} ${PCAP_LIB})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} ${PCAP_LIB} "-ldl")
 
 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(haltests)
+ADD_SUBDIRECTORY(gtest)