diff options
| author |   Jonathan Aillet <jonathan.aillet@iot.bzh> | 2019-01-25 12:18:20 +0100 |
|---|---|---|
| committer | Jonathan Aillet <jonathan.aillet@iot.bzh> | 2019-01-28 15:38:58 +0100 |
| commit | 20a22fadf78660394ca2ce8354530306288578fc (patch) | |
| tree | 7430fcf977ed7326bb076e954009fc75f6b3cf05 | |
| parent | 9f6a13d05025bc33c12b6103d9bb960e842270d2 (diff) | |
Migrate app-controller from submodule to library
Change-Id: I5a3de70994374e9a447fde67eef5925915335863
Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | 4a-hal-utilities/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | 4a-hal/CMakeLists.txt | 2 | ||||
| m--------- | app-controller | 0 | ||||
| -rw-r--r-- | conf.d/cmake/config.cmake | 1 | ||||
| -rw-r--r-- | plugins/lib/bluealsa/CMakeLists.txt | 2 |
6 files changed, 1 insertions, 13 deletions
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 1b125e4..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "app-controller"] - path = app-controller - url = https://gerrit.automotivelinux.org/gerrit/apps/app-controller-submodule diff --git a/4a-hal-utilities/CMakeLists.txt b/4a-hal-utilities/CMakeLists.txt index f9291ea..76cc511 100644 --- a/4a-hal-utilities/CMakeLists.txt +++ b/4a-hal-utilities/CMakeLists.txt @@ -28,12 +28,6 @@ PROJECT_TARGET_ADD(4a-hal-utilities) 4a-hal-utilities-hal-streams-handler.c 4a-hal-utilities-verbs-loader.c) - # Library dependencies (include updates automatically) - TARGET_LINK_LIBRARIES(${TARGET_NAME} - ctl-utilities - ${link_libraries} - ) - # Define target includes for this target client TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/4a-hal/CMakeLists.txt b/4a-hal/CMakeLists.txt index 38cbc29..532e061 100644 --- a/4a-hal/CMakeLists.txt +++ b/4a-hal/CMakeLists.txt @@ -43,9 +43,7 @@ PROJECT_TARGET_ADD(4a-hal) # Library dependencies (include updates automatically) TARGET_LINK_LIBRARIES(${TARGET_NAME} - ctl-utilities 4a-hal-utilities - ${link_libraries} ) # Define target includes for this target client diff --git a/app-controller b/app-controller deleted file mode 160000 -Subproject f8531f98503e72238253d4faff634293ad4d194 diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index b771524..9fe7d49 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -74,6 +74,7 @@ set (PKG_REQUIRED_LIST uuid alsa>=1.1.2 afb-helpers + ctl-utilities ) # Prefix path where will be installed the files diff --git a/plugins/lib/bluealsa/CMakeLists.txt b/plugins/lib/bluealsa/CMakeLists.txt index 6243200..e7d3216 100644 --- a/plugins/lib/bluealsa/CMakeLists.txt +++ b/plugins/lib/bluealsa/CMakeLists.txt @@ -37,10 +37,8 @@ PROJECT_TARGET_ADD(hal-bluealsa) # Library dependencies (include updates automatically) TARGET_LINK_LIBRARIES(${TARGET_NAME} - ctl-utilities 4a-hal-utilities ${BLUEALSA_LIBRARIES} - ${link_libraries} ) TARGET_COMPILE_OPTIONS(${TARGET_NAME} PUBLIC ${BLUEALSA_CFLAGS}) |