projects
/
platform
/
core
/
connectivity
/
net-config.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Using updated clatd's Dbus interface and Path values" into tizen
[platform/core/connectivity/net-config.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
1069cdd
..
8abfbac
100755
(executable)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-1,5
+1,5
@@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
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")
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-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
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/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
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/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
src/signal-handler.c
src/utils/emulator.c
src/wifi-eap-config.c
@@
-40,6
+44,8
@@
SET(SRCS
src/wifi-config.c
src/wifi-extension.c
src/ip-conflict-detect.c
src/wifi-config.c
src/wifi-extension.c
src/ip-conflict-detect.c
+ src/clatd-handler.c
+ src/wifi-dpp.c
)
IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
)
IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
@@
-55,14
+61,6
@@
IF(TIZEN_WLAN_USE_P2P_INTERFACE)
ADD_DEFINITIONS(-DTIZEN_WLAN_USE_P2P_INTERFACE)
ENDIF(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)
IF(TIZEN_CAPTIVE_PORTAL)
ADD_DEFINITIONS(-DTIZEN_CAPTIVE_PORTAL)
SET(SRCS ${SRCS} src/utils/network-accessibility.c)
@@
-72,6
+70,11
@@
IF(TIZEN_WEARABLE)
ADD_DEFINITIONS(-DTIZEN_WEARABLE)
ENDIF(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
INCLUDE(FindPkgConfig)
PKG_CHECK_MODULES(pkgs REQUIRED
dlog
@@
-80,7
+83,10
@@
PKG_CHECK_MODULES(pkgs REQUIRED
glib-2.0
gio-unix-2.0
capi-system-info
glib-2.0
gio-unix-2.0
capi-system-info
+ key-manager
libtzplatform-config
libtzplatform-config
+ libnl-3.0
+ libnl-genl-3.0
${P2P_REQUIRED_PKGS}
${WEARABLE_REQUIRED_PKGS}
)
${P2P_REQUIRED_PKGS}
${WEARABLE_REQUIRED_PKGS}
)
@@
-91,14
+97,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(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")
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")
FIND_PROGRAM(UNAME NAMES uname)
EXEC_PROGRAM("${UNAME}" ARGS "-m"
OUTPUT_VARIABLE "ARCH")
@@
-119,7
+121,7
@@
ADD_CUSTOM_COMMAND(
--generate-c-code generated-code
--c-generate-object-manager
--generate-docbook generated-code-docs
--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)
COMMENT "Generating GDBus .c/.h")
ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS} ${CMAKE_SOURCE_DIR}/generated-code.c)
@@
-131,3
+133,7
@@
INSTALL(FILES ${CMAKE_SOURCE_DIR}/config/security-network-config.conf DESTINATIO
ADD_SUBDIRECTORY(plugin/headed)
ADD_SUBDIRECTORY(plugin/telephony)
ADD_SUBDIRECTORY(plugin/headed)
ADD_SUBDIRECTORY(plugin/telephony)
+ADD_SUBDIRECTORY(haltests)
+IF(BUILD_GTESTS)
+ ADD_SUBDIRECTORY(gtest)
+ENDIF(BUILD_GTESTS)