Merge "Set default value for APP_TEMPLATES_DIR and WIDGET_ENTRY_POINT"
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>
Mon, 12 Jun 2017 08:35:03 +0000 (08:35 +0000)
committerGerrit Code Review <gerrit@automotivelinux.org>
Mon, 12 Jun 2017 08:35:03 +0000 (08:35 +0000)
1  2 
cmake/common.cmake
cmake/config.cmake.sample

@@@ -187,8 -187,14 +187,13 @@@ macro(wgt_package_build
        if(NOT EXISTS ${WGT_TEMPLATE_DIR}/icon-default.png)
                MESSAGE(FATAL_ERROR "${Red}WARNING ! Missing mandatory files to build widget file.\nYou need ${PROJECT_ICON} file in ${WGT_TEMPLATE_DIR} folder.${ColourReset}")
        endif()
+     if(NOT WIDGET_TYPE)
+         MESSAGE(FATAL_ERROR "WIDGET_TYPE must be set in your config.cmake.\neg.: set(WIDGET_TYPE application/vnd.agl.service)")
+     endif()
+     set(WIDGET_ENTRY_POINT lib CACHE STRING "the widget entry point file")
  
        configure_file(${WIDGET_CONFIG_TEMPLATE} ${PROJECT_PKG_BUILD_DIR}/config.xml)
 -      configure_file(${WIDGET_CONFIG_TEMPLATE} ${PROJECT_PKG_ENTRY_POINT}/config.xml)
        file(COPY ${WGT_TEMPLATE_DIR}/icon-default.png DESTINATION ${PROJECT_PKG_BUILD_DIR})
        file(RENAME ${PROJECT_PKG_BUILD_DIR}/icon-default.png ${PROJECT_PKG_BUILD_DIR}/${PROJECT_ICON})
  
Simple merge