summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Collignon <loic.collignon@iot.bzh>2018-06-29 20:42:52 +0200
committerLoïc Collignon <loic.collignon@iot.bzh>2018-06-29 20:42:52 +0200
commitb8b5c0850617ab11e1497acb9d929ef69916d1b5 (patch)
tree64dae4744b22328be66733c5c4c2d87b4fe47e7b
parent3ce21dd891e15dea70d18ee795425e60ac062388 (diff)
Fix search path for config fileflounder_5.99.1flounder/5.99.15.99.1
App templates make the config path change after each commit. This is a workaround until app templates are fixed or a better solution is found. Change-Id: I73fd69cf12f3ff2e283e80d2ae56629c290f7a9a Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
-rw-r--r--conf.d/cmake/config.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 6c0afb0..02671cc 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -95,7 +95,7 @@ set(COMPILE_OPTIONS
-DMAX_LINEAR_DB_SCALE=24 # until 24db volume normalisation use a simple linear scale
-DTLV_BYTE_SIZE=256 # Alsa use 4096 as default but 256 should fit most sndcards
-DCONTROL_MAXPATH_LEN=255
--DCONTROL_CONFIG_PATH="${CMAKE_CURRENT_BINARY_DIR}/package/etc:${CMAKE_SOURCE_DIR}/conf.d/project:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}:/var/local/lib/afm/applications/${PROJECT_NAME}/${PROJECT_VERSION}/etc"
+-DCONTROL_CONFIG_PATH="${CMAKE_CURRENT_BINARY_DIR}/package/etc:${CMAKE_SOURCE_DIR}/conf.d/project:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}:/var/local/lib/afm/applications/${PROJECT_NAME}"
-DCONTROL_PLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/plugins/lib:${CMAKE_BINARY_DIR}/package/lib/plugins:/var/local/lib/afm/applications/${PROJECT_NAME}/${PROJECT_VERSION}/lib/plugins"
-DCONTROL_LUA_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/plugins/lua:${CMAKE_BINARY_DIR}/package/data:/var/local/lib/afm/applications/${PROJECT_NAME}/${PROJECT_VERSION}/var"
-DUSE_API_DYN=1