diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2018-10-23 16:06:54 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2018-10-31 16:55:28 +0100 |
| commit | 6a6963c5627d30b05c1be4d4b95badb7dc73eb28 (patch) | |
| tree | 1a719f253483013e424e1923dcb37470f986d831 | |
| parent | ef3575fd397498a57c09c0caa3ffde8ec3040aab (diff) | |
Migrate app-templates to CMake module
Bug-AGL SPEC-1682
Change-Id: Ic4a8925d8be17ab6d53d18ca8abaf99ce348ded8
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| -rw-r--r-- | alsa-binding/CMakeLists.txt | 1 | ||||
| m--------- | conf.d/app-templates | 0 | ||||
| -rw-r--r-- | conf.d/cmake/config.cmake | 9 |
3 files changed, 6 insertions, 4 deletions
diff --git a/alsa-binding/CMakeLists.txt b/alsa-binding/CMakeLists.txt index 5f683d6..82694e0 100644 --- a/alsa-binding/CMakeLists.txt +++ b/alsa-binding/CMakeLists.txt @@ -26,7 +26,6 @@ PROJECT_TARGET_ADD(alsa-4a) SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES PREFIX "afb-" LABELS "BINDING" - LINK_FLAGS ${BINDINGS_LINK_FLAG} OUTPUT_NAME ${TARGET_NAME} ) diff --git a/conf.d/app-templates b/conf.d/app-templates deleted file mode 160000 -Subproject f94e45e8a48e16e3001cb55c4f8c3c0a2a2c9e2 diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 96d0201..65e6290 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -29,9 +29,9 @@ set(PROJECT_AUTHOR_MAIL "fulup@iot.bzh") set(PROJECT_LICENSE "Apache-V2") set(PROJECT_LANGUAGES,"C") -# Where are stored default templates files from submodule or subtree app-templates in your project tree +# Where are stored the project configuration files # relative to the root project directory -set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates") +set(PROJECT_CMAKE_CONF_DIR "conf.d") # Where are stored your external libraries for your project. This is 3rd party library that you don't maintain # but used and must be built and linked. @@ -223,5 +223,8 @@ set(CONTROL_SUPPORT_LUA 1 CACHE BOOL "Active or not LUA Support") # This include is mandatory and MUST happens at the end # of this file, else you expose you to unexpected behavior +# +# This CMake module could be found at the following url: +# https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/cmake-apps-module # ----------------------------------------------------------- -include(${PROJECT_APP_TEMPLATES_DIR}/cmake/common.cmake) +include(CMakeAfbTemplates) |