From af8fd545eee24fb2d6a8d472912f9c606b044278 Mon Sep 17 00:00:00 2001 From: Matt Ranostay Date: Fri, 11 Aug 2017 12:31:35 -0700 Subject: binding: wifi: switch from qmake to cmake Switch from legacy qmake to cmake to build binding Bug-AGL: SPEC-823 Change-Id: I55532be199415a4d4adb441446c1143da9ef8edf Signed-off-by: Matt Ranostay --- binding-wifi/CMakeLists.txt | 43 ++++++++++++++++++++++++++++++++++++++++++ binding-wifi/agent.o | Bin 0 -> 67632 bytes binding-wifi/binding-wifi.pro | 11 ----------- binding-wifi/binding.pri | 6 ------ binding-wifi/export.map | 1 - binding-wifi/wifi-api.o | Bin 0 -> 124952 bytes binding-wifi/wifi-connman.o | Bin 0 -> 76504 bytes 7 files changed, 43 insertions(+), 18 deletions(-) create mode 100644 binding-wifi/CMakeLists.txt create mode 100644 binding-wifi/agent.o delete mode 100644 binding-wifi/binding-wifi.pro delete mode 100644 binding-wifi/binding.pri delete mode 100644 binding-wifi/export.map create mode 100644 binding-wifi/wifi-api.o create mode 100644 binding-wifi/wifi-connman.o (limited to 'binding-wifi') diff --git a/binding-wifi/CMakeLists.txt b/binding-wifi/CMakeLists.txt new file mode 100644 index 0000000..54fef96 --- /dev/null +++ b/binding-wifi/CMakeLists.txt @@ -0,0 +1,43 @@ +########################################################################### +# Copyright 2015, 2016, 2017 IoT.bzh +# +# author: Fulup Ar Foll +# contrib: Romain Forlot +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + +# Add target to project dependency list +PROJECT_TARGET_ADD(wifi-binding) + + # Define project Targets + add_library(${TARGET_NAME} MODULE + agent.c + wifi-api.c + wifi-connman.c) + + # Binder exposes a unique public entry point + SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES + PREFIX "libafm-" + LABELS "BINDING" + LINK_FLAGS ${BINDINGS_LINK_FLAG} + OUTPUT_NAME ${TARGET_NAME} + ) + + # Library dependencies (include updates automatically) + TARGET_LINK_LIBRARIES(${TARGET_NAME} ${link_libraries}) + + # installation directory + INSTALL(TARGETS ${TARGET_NAME} + LIBRARY DESTINATION ${BINDINGS_INSTALL_DIR}) + diff --git a/binding-wifi/agent.o b/binding-wifi/agent.o new file mode 100644 index 0000000..4e2dd65 Binary files /dev/null and b/binding-wifi/agent.o differ diff --git a/binding-wifi/binding-wifi.pro b/binding-wifi/binding-wifi.pro deleted file mode 100644 index 11538e1..0000000 --- a/binding-wifi/binding-wifi.pro +++ /dev/null @@ -1,11 +0,0 @@ -TARGET = agl-wifi-binding - -HEADERS = wifi-api.h wifi-connman.h -SOURCES = agent.c wifi-api.c wifi-connman.c - -LIBS += -Wl,--version-script=$$PWD/export.map - -CONFIG += link_pkgconfig -PKGCONFIG += json-c afb-daemon glib-2.0 gio-2.0 gobject-2.0 zlib - -include(binding.pri) diff --git a/binding-wifi/binding.pri b/binding-wifi/binding.pri deleted file mode 100644 index 3448a56..0000000 --- a/binding-wifi/binding.pri +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = lib -CONFIG += plugin use_c_linker -CONFIG -= qt -QMAKE_CFLAGS += -Wextra -Wconversion -Wno-unused-parameter -Werror=maybe-uninitialized -Werror=implicit-function-declaration -ffunction-sections -fdata-sections -Wl,--as-needed -Wl,--gc-sections - -DESTDIR = $${OUT_PWD}/../package/root/lib diff --git a/binding-wifi/export.map b/binding-wifi/export.map deleted file mode 100644 index eea0d7b..0000000 --- a/binding-wifi/export.map +++ /dev/null @@ -1 +0,0 @@ -{ global: afbBindingV2*; local: *; }; diff --git a/binding-wifi/wifi-api.o b/binding-wifi/wifi-api.o new file mode 100644 index 0000000..27b92b8 Binary files /dev/null and b/binding-wifi/wifi-api.o differ diff --git a/binding-wifi/wifi-connman.o b/binding-wifi/wifi-connman.o new file mode 100644 index 0000000..f756649 Binary files /dev/null and b/binding-wifi/wifi-connman.o differ -- cgit 1.2.3-korg