aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-05-24 16:37:11 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-05-24 16:37:11 +0200
commit1a3d7bb1dd24ab625019aec2d3d62b02a7f60d13 (patch)
tree4b722c1c06368fd82d752a3537bb2f347fce1211
parent672ae412fa42bb7671b69a0adacc3afc9a5ba931 (diff)
Fix: can't build wgt file
Fix changed icon file name. Change-Id: I2c8ab65df8ffe245f8f52fc8a147c19e76aa069c Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--default/cmake/common.cmake4
1 files changed, 2 insertions, 2 deletions
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