diff options
| author |   Loïc Collignon <loic.collignon@iot.bzh> | 2019-03-21 23:46:53 +0100 |
|---|---|---|
| committer | Loïc Collignon <loic.collignon@iot.bzh> | 2019-04-29 14:30:20 +0200 |
| commit | 10c4b1602186f1f9457ec35fafc605468bc6b8bb (patch) | |
| tree | c10009a282e18323a6544270540e81a08eef503b | |
| parent | a3d48d6871e4f508b03de540b277361d2cdb7d96 (diff) | |
Removed controller and utilities submodules
Controller and submodules are now provided as static libraries so
submodules are not required anymore.
Bug: SPEC-2139
Change-Id: Ie5dfa0d678390f167ffbecd53355d9f8b5f98209
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
| -rw-r--r-- | .gitmodules | 6 | ||||
| m--------- | afb-utilities | 0 | ||||
| -rw-r--r-- | ahl-binding/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | conf.d/cmake/config.cmake | 2 | ||||
| m--------- | controller | 0 |
5 files changed, 3 insertions, 10 deletions
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 14d4871..0000000 --- a/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule "afb-utilities"] - path = afb-utilities - url = https://gerrit.automotivelinux.org/gerrit/apps/app-afb-helpers-submodule -[submodule "controller"] - path = controller - url = https://gerrit.automotivelinux.org/gerrit/p/apps/app-controller-submodule.git diff --git a/afb-utilities b/afb-utilities deleted file mode 160000 -Subproject f0ce5b665dd33b285d723720c16ac0542cde4e6 diff --git a/ahl-binding/CMakeLists.txt b/ahl-binding/CMakeLists.txt index 7ccf470..1652a9d 100644 --- a/ahl-binding/CMakeLists.txt +++ b/ahl-binding/CMakeLists.txt @@ -40,17 +40,14 @@ PROJECT_TARGET_ADD(audiohighlevel) TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME} PUBLIC ${GLIB_PKG_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../controller/ctl-lib - ${CMAKE_CURRENT_SOURCE_DIR}/../afb-utilities ) # Library dependencies (include updates automatically) # Find package for GLIB does not seem to export TARGET_LINK_LIBRARIES(${TARGET_NAME} #ahl-policy - afb-helpers - ctl-utilities + appcontroller ${GLIB_PKG_LIBRARIES} ${link_libraries} ) diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 69082be..9f060ad 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -65,6 +65,8 @@ set (PKG_REQUIRED_LIST libafbwsc glib-2.0 lua>=5.3 + appcontroller + afb-helpers ) # Compilation options definition diff --git a/controller b/controller deleted file mode 160000 -Subproject 33abde52666af1335571252143d21de5d305ca9 |