X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=CMakeLists.txt;h=1069cdd613491a69dfe7b18688d70ee99777d126;hb=e049e999fc589de8f76dc7ad88f9e695bec35d7a;hp=fbf35e8d043a163ae7101f11469f735cd7535c7d;hpb=135a8e2741583f9fd36570bd0101a332120b98aa;p=platform%2Fcore%2Fconnectivity%2Fnet-config.git diff --git a/CMakeLists.txt b/CMakeLists.txt index fbf35e8..1069cdd 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) PROJECT(net-config C) 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,7 @@ SET(SRCS src/neterror.c src/wifi-eap.c src/wifi-wps.c + src/wifi-bssid-scan.c src/wifi-agent.c src/wifi-power.c src/wifi-state.c @@ -31,14 +32,14 @@ SET(SRCS src/wifi-firmware.c src/wifi-indicator.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 "") @@ -56,7 +57,6 @@ 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) @@ -75,17 +75,12 @@ ENDIF(TIZEN_WEARABLE) 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 + libtzplatform-config ${P2P_REQUIRED_PKGS} ${WEARABLE_REQUIRED_PKGS} ) @@ -129,6 +124,10 @@ ADD_CUSTOM_COMMAND( 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)