Merge "Update config.cmake.sample"

diff --git a/README.md b/README.md
index aa76f37..77cc271 100644 (file)
--- a/README.md
+++ b/README.md
@@ -122,7 +122,7 @@ populate_widget() --> add target to widget tree depending upon target properties
 
 #### config.xml.in file
 
-To build a widget you need to configure file _config.xml_. This repo 
+To build a widget you need to configure file _config.xml_. This repo
 provide a simple default file _config.xml.in_ that will be configured using the
 variable set in _config.cmake_  file.
 
@@ -171,7 +171,7 @@ Example:
 PROJECT_TARGET_ADD(low-can-demo)
 ```
 
-> ***NOTE***: This will make available the variable `${TARGET_NAME}` 
+> ***NOTE***: This will make available the variable `${TARGET_NAME}`
 > set with the specificied name. This variable will change at the next call
 > to this macros.
 

diff --git a/cmake/common.cmake b/cmake/common.cmake
index d88f89c..353e1ec 100644 (file)
--- a/cmake/common.cmake
+++ b/cmake/common.cmake
@@ -187,11 +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()
+       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")
+       if(NOT WIDGET_ENTRY_POINT)
+               set(WIDGET_ENTRY_POINT lib)
+       endif()
 
        configure_file(${WIDGET_CONFIG_TEMPLATE} ${PROJECT_PKG_BUILD_DIR}/config.xml)
        file(COPY ${WGT_TEMPLATE_DIR}/icon-default.png DESTINATION ${PROJECT_PKG_BUILD_DIR})
@@ -338,7 +340,7 @@ foreach (PKG_CONFIG ${PKG_REQUIRED_LIST})
        PKG_CHECK_MODULES(${XPREFIX} REQUIRED ${PKG_CONFIG})
 
        INCLUDE_DIRECTORIES(${${XPREFIX}_INCLUDE_DIRS})
-       list (APPEND link_libraries ${${XPREFIX}_LIBRARIES})
+       list (APPEND link_libraries ${${XPREFIX}_LDFLAGS})
        add_compile_options (${${XPREFIX}_CFLAGS})
 endforeach(PKG_CONFIG)
 
@@ -369,8 +371,6 @@ else()
        set(PROJECT_PKG_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/package CACHE PATH "Application contents to be packaged")
 endif()
 
-set (PROJECT_APP_TEMPLATES_DIR "conf.d/templates" CACHE PATH "Default Templates directory")
-
 set (PKG_TEMPLATE_PREFIX ${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR} CACHE PATH "Default Package Templates Directory")
 set(SSH_TEMPLATE_DIR "${PKG_TEMPLATE_PREFIX}/ssh" CACHE PATH "Subpath to a directory where are stored needed files to launch on remote target to debuging purposes")
 set(GDB_TEMPLATE_DIR "${PKG_TEMPLATE_PREFIX}/gdb" CACHE PATH "Subpath to a directory where are stored needed files to launch debuging server on a remote target. Use gdbserver.")

diff --git a/cmake/config.cmake.sample b/cmake/config.cmake.sample
index 4e253d5..43a7547 100644 (file)
--- a/cmake/config.cmake.sample
+++ b/cmake/config.cmake.sample
@@ -31,7 +31,7 @@ set(PROJECT_LANGUAGES,"C")
 
 # Where are stored default templates files from submodule or subtree app-templates in your project tree
 # relative to the root project directory
-set(PROJECT_APP_TEMPLATES_DIR "conf.d/templates")
+set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
 
 # Where are stored your external libraries for your project. This is 3rd party library that you don't maintain
 # but used and must be built and linked.

diff --git a/ssh/start-on-target.in b/ssh/start-on-target.in
index b0623cf..a21c6d1 100644 (file)
--- a/ssh/start-on-target.in
+++ b/ssh/start-on-target.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# 
+#
 # File:   start-on-target.sh
 # Author: Fulup Ar Foll @ IoT.bzh
 # Object: Forward signal (SIGTERM) to remote process