From 8c2b05967a3237e624a2cc78e13fcd1c5e72991c Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Thu, 9 Nov 2017 23:00:53 -0500
Subject: 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>
---
cmake/cmake.d/02-variables.cmake | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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")
--
cgit