diff options
| author |   Stephane Desneux <stephane.desneux@iot.bzh> | 2017-06-09 01:08:00 +0200 |
|---|---|---|
| committer | Stephane Desneux <stephane.desneux@iot.bzh> | 2017-06-09 01:08:00 +0200 |
| commit | a487927e6cf084083eed7b25ca962aff9aeaf420 (patch) | |
| tree | c4a0cb9ec8ad4e05550ba2d0c24466123fedb6b9 | |
| parent | 6d6aff6f76ae024c382f8bd76cf86602c472590a (diff) | |
cmake: add WIDGET_CONFIG_TEMPLATE setting to specify location for config.xml.in
Change-Id: I285196388c12145b6b049af692a7a67c03aaba24
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
| -rw-r--r-- | cmake/common.cmake | 14 | ||||
| -rw-r--r-- | cmake/config.cmake.sample | 6 |
2 files changed, 15 insertions, 5 deletions
diff --git a/cmake/common.cmake b/cmake/common.cmake index 63396f6..03c7b30 100644 --- a/cmake/common.cmake +++ b/cmake/common.cmake @@ -181,12 +181,15 @@ macro(remote_targets_populate) endmacro(remote_targets_populate) macro(wgt_package_build) - if(NOT EXISTS ${WGT_TEMPLATE_DIR}/config.xml.in OR NOT EXISTS ${WGT_TEMPLATE_DIR}/icon-default.png) - MESSAGE(FATAL_ERROR "${Red}WARNING ! Missing mandatory files to build widget file.\nYou need config.xml.in and ${PROJECT_ICON} files in ${WGT_TEMPLATE_DIR} folder.${ColourReset}") + if(NOT EXISTS ${WIDGET_CONFIG_TEMPLATE}) + MESSAGE(FATAL_ERROR "${Red}WARNING ! Missing mandatory files to build widget file.\nYou need a config.xml template: please specify WIDGET_CONFIG_TEMPLATE correctly.${ColourReset}") + endif() + 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() - configure_file(${WGT_TEMPLATE_DIR}/config.xml.in ${PROJECT_PKG_BUILD_DIR}/config.xml) - configure_file(${WGT_TEMPLATE_DIR}/config.xml.in ${PROJECT_PKG_ENTRY_POINT}/config.xml) + 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}) @@ -366,6 +369,9 @@ set (PKG_TEMPLATE_PREFIX ${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR} CACHE 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.") set(WGT_TEMPLATE_DIR "${PKG_TEMPLATE_PREFIX}/wgt" CACHE PATH "Subpath to a directory where are stored needed files to build widget") +if(NOT WIDGET_CONFIG_TEMPLATE) + set(WIDGET_CONFIG_TEMPLATE ${WGT_TEMPLATE_DIR}/config.xml.in CACHE PATH "Path to widget config file template (config.xml.in)") +endif() set(RPM_TEMPLATE_DIR "${PKG_TEMPLATE_PREFIX}/rpm" CACHE PATH "Subpath to a directory where are stored needed files to build rpm package") set(DEB_TEMPLATE_DIR "${PKG_TEMPLATE_PREFIX}/deb" CACHE PATH "Subpath to a directory where are stored needed files to build deb package") diff --git a/cmake/config.cmake.sample b/cmake/config.cmake.sample index ccef5a7..9573598 100644 --- a/cmake/config.cmake.sample +++ b/cmake/config.cmake.sample @@ -80,6 +80,10 @@ set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt) set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib) +# Optional location for config.xml.in +# ----------------------------------- +#set(WIDGET_CONFIG_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/conf.d/config.xml.in) + # Mandatory widget Mimetype specification # -------------------------------------------------- # Choose between : @@ -129,4 +133,4 @@ set(WIDGET_ENTRY_POINT EntryPoint_Path_Not_Set) # and port use for remote debugging. #------------------------------------------------------------ #set(AFB_TOKEN "" CACHE PATH "Default AFB_TOKEN") -#set(AFB_REMPORT "1234" CACHE PATH "Default AFB_TOKEN")
\ No newline at end of file +#set(AFB_REMPORT "1234" CACHE PATH "Default AFB_TOKEN") |