summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2017-11-09 23:00:53 -0500
committerScott Murray <scott.murray@konsulko.com>2017-11-09 23:00:53 -0500
commit8c2b05967a3237e624a2cc78e13fcd1c5e72991c (patch)
tree0ff3cfd3f0ac3aca545f01f81c06607351e71d98
parentc881d86fc8852a2b2215856d3503aba192c0f4ee (diff)
Fix finding config template
Commit 9a73785 ("Better handling icon&config.xml to build widget") seems to have accidentally broken an application providing its own config template, resulting in the stock templates always being used. That results in breakage like extra permissions in the app's version not being picked up. The logic for setting WIDGET_CONFIG_TEMPLATE has been reverted to what it was previously to fix the behavior. Change-Id: I245bc08f466b883b61c286faed933a5e57a74845 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-rw-r--r--cmake/cmake.d/02-variables.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/cmake.d/02-variables.cmake b/cmake/cmake.d/02-variables.cmake
index a4634d4..e90ff11 100644
--- a/cmake/cmake.d/02-variables.cmake
+++ b/cmake/cmake.d/02-variables.cmake
@@ -111,7 +111,9 @@ string(REGEX REPLACE "^(.*)/.*$" "\\1" ENTRY_POINT "${PKG_TEMPLATE_PREFIX}")
set(PROJECT_PKG_ENTRY_POINT ${ENTRY_POINT}/packaging CACHE PATH "Where package build files, like rpm.spec file or config.xml, are write.")
set(WIDGET_ICON "${ENTRY_POINT}/wgt/${PROJECT_ICON}" CACHE PATH "Path to the widget icon")
-set(WIDGET_CONFIG_TEMPLATE ${TEMPLATE_DIR}/config.xml.in CACHE PATH "Path to widget config file template (config.xml.in)")
+if(NOT WIDGET_CONFIG_TEMPLATE)
+ set(WIDGET_CONFIG_TEMPLATE ${TEMPLATE_DIR}/config.xml.in CACHE PATH "Path to widget config file template (config.xml.in)")
+endif()
# Path to autobuild template
set(PROJECT_TEMPLATE_AGL_AUTOBUILD_DIR ${CMAKE_SOURCE_DIR}/conf.d/autobuild/agl CACHE PATH "Subpath to a directory where are stored autobuild script")