aboutsummaryrefslogtreecommitdiffstats
path: root/conf.d
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2018-08-03 08:54:06 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2018-08-16 13:52:02 +0000
commitf8c4be3defa8717ee1b6e7c2770cb6c32ed698f0 (patch)
tree21d49bdd35b9e499c48bc3f06a65d2ac78941546 /conf.d
parent01343266b1d75f75f1b3271d79323094dc400be5 (diff)
Fix wrong language and auto-versionning
Version is handled by the app-templates if PROJECT_VERSION is not set. Adjusts pattern to match lua files location Change-Id: I40052e86d5f55ef2c43f9f1266e1ac3fe14db0c8 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'conf.d')
-rw-r--r--conf.d/cmake/config.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 08b675a..02c1ac7 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -19,7 +19,6 @@
# Project Info
# ------------------
set(PROJECT_NAME afTest)
-set(PROJECT_VERSION "6.0")
set(PROJECT_PRETTY_NAME "Application Framework Test")
set(PROJECT_DESCRIPTION "Binding used to test other binding")
set(PROJECT_URL "https://github.com/iotbzh/afb-test")
@@ -27,7 +26,7 @@ set(PROJECT_ICON "icon.png")
set(PROJECT_AUTHOR "Forlot Romain")
set(PROJECT_AUTHOR_MAIL "romain.forlot@iot.bzh")
set(PROJECT_LICENSE "APL2.0")
-set(PROJECT_LANGUAGES "CXX")
+set(PROJECT_LANGUAGES "C")
# Where are stored default templates files from submodule or subtree app-templates in your project tree
# relative to the root project directory
@@ -126,6 +125,7 @@ list(APPEND link_libraries afb-helpers)
# CACHE STRING "Compilation flags for RELEASE build type.")
set(CONTROL_SUPPORT_LUA 1)
+add_definitions(-DLUA_GLOB_PATTERN="/var/?.lua\\\;")
add_definitions(-DCONTROL_PLUGIN_PATH="./var:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/var:${INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins:${INSTALL_PREFIX}/${PROJECT_NAME}/var:${CMAKE_BINARY_DIR}/package/lib/plugins:${CMAKE_BINARY_DIR}/package/var")
add_definitions(-DCONTROL_CONFIG_PATH="./etc:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc:${INSTALL_PREFIX}/${PROJECT_NAME}/etc:${CMAKE_BINARY_DIR}/package/etc")
add_definitions(-DCTL_PLUGIN_MAGIC=1286576532)