diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-08-22 19:14:32 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-08-22 19:14:32 +0200 |
| commit | e61a5dbfe08fb96a1d293f5ca7fffe8b693ecaf8 (patch) | |
| tree | c6bc5c4286bd4bb3ccb20de7179f8c7a0617c77f | |
| parent | 450ae7e324165efa84e398b224d01c7ef1710579 (diff) | |
Separated afb-utilities submodule used
filescan adn wrap-=json now separated.
Change-Id: Ie8006b43625173b0c91056c61c394a2804cb3542
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 21 | ||||
| -rw-r--r-- | Controller-afb/CMakeLists.txt | 3 | ||||
| m--------- | afb-utilities | 0 |
4 files changed, 26 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index b545da1..54b5c1f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "conf.d/app-templates"] path = conf.d/app-templates url = https://gerrit.automotivelinux.org/gerrit/apps/app-templates +[submodule "afb-utilities"] + path = afb-utilities + url = git@github.com:iotbzh/afb-utilities diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..22adb2a --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,21 @@ +########################################################################### +# Copyright 2015, 2016, 2017 IoT.bzh +# +# author: Fulup Ar Foll <rfulup@iot.bzh> +# +# 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. +########################################################################### +CMAKE_MINIMUM_REQUIRED(VERSION 3.5) + +# Do not change this file, config is located into conf.d +include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/cmake/config.cmake) diff --git a/Controller-afb/CMakeLists.txt b/Controller-afb/CMakeLists.txt index 7a99b3e..514c091 100644 --- a/Controller-afb/CMakeLists.txt +++ b/Controller-afb/CMakeLists.txt @@ -31,7 +31,7 @@ endif(CONTROL_SUPPORT_LUA) PROJECT_TARGET_ADD(control-afb) # Define project Targets - ADD_LIBRARY(${TARGET_NAME} MODULE ctl-binding.c ctl-timer.c ctl-dispatch.c ${CTL_LUA_SOURCE} filescan-utils.c wrap-json.c) + ADD_LIBRARY(${TARGET_NAME} MODULE ctl-binding.c ctl-timer.c ctl-dispatch.c ${CTL_LUA_SOURCE}) SET_OPENAPI_FILENAME("ctl-apidef") # Binder exposes a unique public entry point @@ -44,6 +44,7 @@ PROJECT_TARGET_ADD(control-afb) # Library dependencies (include updates automatically) TARGET_LINK_LIBRARIES(${TARGET_NAME} + afb-utilities ${link_libraries} ) diff --git a/afb-utilities b/afb-utilities new file mode 160000 +Subproject 1860c197a402f76f960eb2e373daf1259592cb6 |