From: Romain Forlot <romain.forlot@iot.bzh>
Date: Wed, 24 May 2017 14:37:11 +0000 (+0200)
Subject: Fix: can't build wgt file
X-Git-Tag: 3.99.2~82
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=1a3d7bb1dd24ab625019aec2d3d62b02a7f60d13;p=apps%2Fapp-templates.git

Fix: can't build wgt file

Fix changed icon file name.

Change-Id: I2c8ab65df8ffe245f8f52fc8a147c19e76aa069c
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---

diff --git a/default/cmake/common.cmake b/default/cmake/common.cmake
index 05a3236..78a0af9 100644
--- a/default/cmake/common.cmake
+++ b/default/cmake/common.cmake
@@ -167,14 +167,14 @@ macro(remote_targets_populate)
 endmacro(remote_targets_populate)
 
 macro(wgt_package_build)
-	if(NOT EXISTS ${TEMPLATE_WGT_DIR}/config.xml.in OR NOT EXISTS ${TEMPLATE_WGT_DIR}/${PROJECT_ICON})
+	if(NOT EXISTS ${TEMPLATE_WGT_DIR}/config.xml.in OR NOT EXISTS ${TEMPLATE_WGT_DIR}/icon-default.png)
 		MESSAGE(SEND_ERROR "${Red}WARNING ! Missing mandatory files to build widget file.\nYou need config.xml.in and ${PROJECT_ICON} files in ${TEMPLATE_WGT_DIR} folder.${ColourReset}")
 	else()
 		# Build widget spec file from template only once (Fulup good idea or should depend on time ????)
 		if(NOT EXISTS ${TEMPLATE_WGT_DIR}/config.xml.in OR NOT EXISTS ${TEMPLATE_WGT_DIR}/${PROJECT_ICON})
 			configure_file(${TEMPLATE_WGT_DIR}/config.xml.in ${PROJECT_PKG_BUILD_DIR}/config.xml)
 			configure_file(${TEMPLATE_WGT_DIR}/config.xml.in ${PROJECT_PKG_ENTRY_POINT}/config.xml)
-			file(COPY ${TEMPLATE_WGT_DIR}/${PROJECT_ICON} DESTINATION ${PROJECT_PKG_BUILD_DIR}/${PROJECT_ICON})
+			file(COPY ${TEMPLATE_WGT_DIR}/icon-default.png DESTINATION ${PROJECT_PKG_BUILD_DIR}/${PROJECT_ICON})
 		endif(NOT EXISTS ${TEMPLATE_WGT_DIR}/config.xml.in OR NOT EXISTS ${TEMPLATE_WGT_DIR}/${PROJECT_ICON})
 
 		# Fulup ??? copy any extra file in wgt/etc into populate package before building the widget