diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-06-27 15:38:34 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-06-27 15:38:34 +0200 |
| commit | 40057249c583faa81082c1cf660be2051f9948b1 (patch) | |
| tree | fc902f2e546f049a5bdf2b3b7d222c9306be8785 | |
| parent | f23cae2eb234ff1851e44dfdecde861fb7595382 (diff) | |
Use latest version of app-templates repo
Change-Id: I580e3cc797e7d213d74b49300d89cd78bf3bb509
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| m--------- | conf.d/app-templates | 0 | ||||
| -rw-r--r-- | conf.d/config.cmake | 14 |
3 files changed, 14 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a97f85..9cdbb14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,13 +19,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.3) include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/config.cmake) -include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/app-templates/cmake/common.cmake) - -# Bindings to compile -# -------------------- -project_subdirs_add() - -project_targets_populate() -project_package_build() - -project_closing_msg() diff --git a/conf.d/app-templates b/conf.d/app-templates -Subproject 21ae95d8eb61745ca54fd143e25dba065a817f6 +Subproject ed512d6aae18909c85cc92f72930998433cbf3d diff --git a/conf.d/config.cmake b/conf.d/config.cmake index 0e92972..b2e7b91 100644 --- a/conf.d/config.cmake +++ b/conf.d/config.cmake @@ -44,10 +44,19 @@ set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates") # Where are stored data for your application. Pictures, static resources must be placed in that folder. # set(PROJECT_RESOURCES "data") +# Which directories inspect to find CMakeLists.txt target files +# set(PROJECT_SRC_DIR_PATTERN "*") + # Compilation Mode (DEBUG, RELEASE) # ---------------------------------- set(CMAKE_BUILD_TYPE "DEBUG") +# Kernel selection if needed. Impose a minimal version. +# NOTE FOR NOW IT CHECKS KERNEL Yocto SDK Kernel version +# else only HOST VERSION +# ----------------------------------------------- +#set (kernel_minimal_version 4.8) + # Compiler selection if needed. Impose a minimal version. # ----------------------------------------------- set (gcc_minimal_version 4.9) @@ -136,3 +145,8 @@ set(WIDGET_ENTRY_POINT "lib/afb-high-can.so") #------------------------------------------------------------ #set(AFB_TOKEN "" CACHE PATH "Default AFB_TOKEN") #set(AFB_REMPORT "1234" CACHE PATH "Default AFB_TOKEN") + +# This include is mandatory and MUST happens at the end +# of this file, else you expose you to unexpected behavior +# ----------------------------------------------------------- +include(${PROJECT_APP_TEMPLATES_DIR}/cmake/common.cmake) |