diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2018-10-23 15:26:34 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2018-10-31 16:52:56 +0100 |
| commit | 596b85a263d7b7dbdabf49edc724f17e207901eb (patch) | |
| tree | 0aa1b00e4ea942e7e3515d82fe6cb008884b8ef0 | |
| parent | e92012bd711eac77fe14064f0e8c9fd233d65b7b (diff) | |
Migrate app-templates to CMake moduleguppy_6.99.1guppy/6.99.16.99.1
Bug-AGL SPEC-1682
Change-Id: I462981b3efb2ff99b5bf42ef17113d509e500661
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| -rw-r--r-- | binding/CMakeLists.txt | 1 | ||||
| m--------- | conf.d/app-templates | 0 | ||||
| -rw-r--r-- | conf.d/cmake/config.cmake | 12 |
3 files changed, 8 insertions, 5 deletions
diff --git a/binding/CMakeLists.txt b/binding/CMakeLists.txt index b1dfac9..f02497f 100644 --- a/binding/CMakeLists.txt +++ b/binding/CMakeLists.txt @@ -11,7 +11,6 @@ PROJECT_TARGET_ADD(taskmanager) 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 e841a7787b2315f068f50d77b04196b7d7ccc17 diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 500a4b9..c82afd6 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -27,10 +27,11 @@ set(PROJECT_AUTHOR "Dimitrov,Yordan") set(PROJECT_AUTHOR_MAIL "y.dimitrov.14@gmail.com") set(PROJECT_LICENSE "APL2.0") set(PROJECT_LANGUAGES "C") +set(API_NAME "taskmanager") -# 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. @@ -41,7 +42,7 @@ set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates") # Compilation Mode (DEBUG, RELEASE) # ---------------------------------- -#set(BUILD_TYPE "DEBUG") +#set(BUILD_TYPE "RELEASE") #set(USE_EFENCE 1) # Kernel selection if needed. You can choose between a @@ -152,5 +153,8 @@ set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install # 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) |