aboutsummaryrefslogtreecommitdiffstats
path: root/conf.d
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-08-18 10:45:11 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-08-18 10:45:11 +0200
commit3648e16e17a908e7f08bde789fefe3abc6981544 (patch)
tree46423715d06b9c166d3b07fed070fcf077114f8f /conf.d
parent6fa8948541948946e3b3e4d93d064e15e33f8e97 (diff)
Latest app-templates features integration
- CMake >= 3.6 mandatory - Change DATA and HTDOCS targets methods to use macro add_input_files() - header generated from OpenAPI file using BINDINGV2 label and set_openapi_filename() macro. - Adjusted README to reflect new cmake requirement Change-Id: I8da515b98c1877d5be5e51f2bf94d691ac3cefb7 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'conf.d')
m---------conf.d/app-templates0
-rw-r--r--conf.d/project/config.d/CMakeLists.txt16
-rw-r--r--conf.d/project/lua.d/CMakeLists.txt16
3 files changed, 8 insertions, 24 deletions
diff --git a/conf.d/app-templates b/conf.d/app-templates
-Subproject 8967162dd12bce89f9ae27f5c9bce7b78624e3f
+Subproject 421f62833dc53ab95648951e75827deb2d9d20b
diff --git a/conf.d/project/config.d/CMakeLists.txt b/conf.d/project/config.d/CMakeLists.txt
index 229cf2d..8070997 100644
--- a/conf.d/project/config.d/CMakeLists.txt
+++ b/conf.d/project/config.d/CMakeLists.txt
@@ -24,17 +24,9 @@ PROJECT_TARGET_ADD(ctl-config.d)
file(GLOB XML_FILES "*.json")
- add_custom_target(${TARGET_NAME}
- DEPENDS ${PROJECT_PKG_BUILD_DIR}/${TARGET_NAME}
- )
+ add_input_files("${XML_FILES}")
- # check XML schema before pushing config
- add_custom_command(
- DEPENDS ${XML_FILES}
- OUTPUT ${PROJECT_PKG_BUILD_DIR}/${TARGET_NAME}
- # COMMAND xmllint -schema ${XML_SCHEMA} ${XML_FILES} --noout (Fulup we miss this for JSON)
- COMMAND mkdir -p ${PROJECT_PKG_BUILD_DIR}/${TARGET_NAME}
- COMMAND touch ${PROJECT_PKG_BUILD_DIR}/${TARGET_NAME}
- COMMAND cp -r ${XML_FILES} ${PROJECT_PKG_BUILD_DIR}/${TARGET_NAME}
+ SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
+ LABELS "DATA"
+ OUTPUT_NAME ${TARGET_NAME}
)
-
diff --git a/conf.d/project/lua.d/CMakeLists.txt b/conf.d/project/lua.d/CMakeLists.txt
index ecf1e6d..5cd61f2 100644
--- a/conf.d/project/lua.d/CMakeLists.txt
+++ b/conf.d/project/lua.d/CMakeLists.txt
@@ -24,17 +24,9 @@ PROJECT_TARGET_ADD(ctl-lua.d)
file(GLOB LUA_FILES "*.lua")
- add_custom_target(${TARGET_NAME}
- DEPENDS ${PROJECT_PKG_BUILD_DIR}/${TARGET_NAME}
- )
+ add_input_files("${LUA_FILES}")
- # check XML schema before pushing config
- add_custom_command(
- DEPENDS ${LUA_FILES}
- OUTPUT ${PROJECT_PKG_BUILD_DIR}/${TARGET_NAME}
- COMMAND ${LUA_COMPILER} ${LUA_FILES}
- COMMAND mkdir -p ${PROJECT_PKG_BUILD_DIR}/${TARGET_NAME}
- COMMAND touch ${PROJECT_PKG_BUILD_DIR}/${TARGET_NAME}
- COMMAND cp -r ${LUA_FILES} ${PROJECT_PKG_BUILD_DIR}/${TARGET_NAME}
+ SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
+ LABELS "DATA"
+ OUTPUT_NAME ${TARGET_NAME}
)
-