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
Fixed memory related issues reported by valgrind.
[platform/core/connectivity/net-config.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
92e9cd1
..
f187136
100755
(executable)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-1,18
+1,21
@@
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(PACKAGE ${PROJECT_NAME})
SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(BINDIR "${PREFIX}/
s
bin")
+SET(BINDIR "${PREFIX}/bin")
SET(DATADIR "${PREFIX}/share")
SET(DATADIR "${PREFIX}/share")
-SET(LIBDIR "${PREFIX}/
lib
")
+SET(LIBDIR "${PREFIX}/
${LIB_PATH}
")
SET(INTERFACES "${CMAKE_SOURCE_DIR}/interfaces")
SET(SRCS
src/main.c
SET(INTERFACES "${CMAKE_SOURCE_DIR}/interfaces")
SET(SRCS
src/main.c
+ src/wifi-tdls.c
src/wifi.c
src/neterror.c
src/wifi-eap.c
src/wifi-wps.c
src/wifi.c
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
src/wifi-agent.c
src/wifi-power.c
src/wifi-state.c
@@
-20,22
+23,27
@@
SET(SRCS
src/wifi-passpoint.c
src/utils/log.c
src/utils/util.c
src/wifi-passpoint.c
src/utils/log.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
+ src/network-dpm.c
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/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/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-config.c
- src/clatd-handler.c
+ src/wifi-extension.c
+ src/ip-conflict-detect.c
)
IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
)
IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
@@
-51,50
+59,31
@@
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)
- 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_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)
IF(TIZEN_WEARABLE)
ADD_DEFINITIONS(-DTIZEN_WEARABLE)
- SET(WEARABLE_REQUIRED_PKGS "weconn")
ENDIF(TIZEN_WEARABLE)
ENDIF(TIZEN_WEARABLE)
-ADD_DEFINITIONS(-DTIZEN_TELEPHONY_ENABLE)
-
-IF(TIZEN_DEBUG_DISABLE)
- ADD_DEFINITIONS(-DTIZEN_DEBUG_DISABLE)
- SET(SRCS ${SRCS} src/wifi-dump.c)
-ENDIF(TIZEN_DEBUG_DISABLE)
+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
- tapi
vconf
vconf
- bundle
gio-2.0
glib-2.0
gio-unix-2.0
gio-2.0
glib-2.0
gio-unix-2.0
- eventsystem
- alarm-service
- syspopup-caller
capi-system-info
capi-system-info
- capi-appfw-application
+ key-manager
+ libtzplatform-config
+ libnl-2.0
${P2P_REQUIRED_PKGS}
${WEARABLE_REQUIRED_PKGS}
)
${P2P_REQUIRED_PKGS}
${WEARABLE_REQUIRED_PKGS}
)
@@
-103,16
+92,12
@@
FOREACH(flag ${pkgs_CFLAGS})
SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
ENDFOREACH(flag)
SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
ENDFOREACH(flag)
-SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -Wall -fvisibility=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_DEBUG "-O0 -g -fPIE")
SET(CMAKE_C_FLAGS_RELEASE "-O2 -fPIE")
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_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")
@@
-124,7
+109,7
@@
ENDIF("${ARCH}" STREQUAL "arm")
ADD_DEFINITIONS("-DPACKAGE=\"${PACKAGE}\"")
ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
ADD_DEFINITIONS("-DPACKAGE=\"${PACKAGE}\"")
ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed
-pie
")
ADD_CUSTOM_COMMAND(
WORKING_DIRECTORY
ADD_CUSTOM_COMMAND(
WORKING_DIRECTORY
@@
-133,11
+118,17
@@
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-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)
-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(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)