Fix:: wrong wgt using RELEASE BUILD TYPE

[apps/app-templates.git] / cmake / cmake.d / 03-macros.cmake

diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake
index c189bd6..085c249 100644 (file)
--- a/cmake/cmake.d/03-macros.cmake
+++ b/cmake/cmake.d/03-macros.cmake
@@ -440,6 +440,12 @@ macro(wgt_package_build)
                set(WIDGET_ENTRY_POINT lib)
        endif()
 
+       if(NOT ${CMAKE_BUILD_TYPE} STREQUAL "RELEASE")
+               string(TOLOWER "${PROJECT_NAME}-${CMAKE_BUILD_TYPE}" WGT_NAME)
+       else()
+               string(TOLOWER "${PROJECT_NAME}" WGT_NAME)
+       endif()
+
        add_custom_command(OUTPUT ${PROJECT_PKG_BUILD_DIR}/config.xml
                COMMAND ${CMAKE_COMMAND} -DINFILE=${WIDGET_CONFIG_TEMPLATE} -DOUTFILE=${PROJECT_PKG_BUILD_DIR}/config.xml -DPROJECT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/cmake/configure_file.cmake
                COMMAND cp ${ICON_PATH} ${PROJECT_PKG_BUILD_DIR}/${PROJECT_ICON}
@@ -453,14 +459,21 @@ macro(wgt_package_build)
                file(COPY "${TEMPLATE_DIR}/etc/*" DESTINATION ${PROJECT_PKG_BUILD_DIR}/etc/)
        endif(${PROJECT_CONF_FILES})
 
-       add_custom_command(OUTPUT ${PROJECT_NAME}.wgt
+       find_program(wgtpkgCMD "wgtpkg-pack")
+       if(wgtpkgCMD)
+               set(packCMD ${wgtpkgCMD} "-f" "-o" "${WGT_NAME}.wgt" ${PROJECT_PKG_BUILD_DIR})
+       else()
+               set(packCMD cd ${PROJECT_PKG_BUILD_DIR} && ${CMAKE_COMMAND} "-E" "tar" "cf" "../${WGT_NAME}.wgt" "--format=zip" "*")
+       endif()
+
+       add_custom_command(OUTPUT ${WGT_NAME}.wgt
                DEPENDS ${PROJECT_TARGETS}
-               COMMAND wgtpkg-pack -f -o ${PROJECT_NAME}.wgt ${PROJECT_PKG_BUILD_DIR}
+               COMMAND ${packCMD}
        )
 
-       add_custom_target(widget DEPENDS ${PROJECT_NAME}.wgt)
+       add_custom_target(widget DEPENDS ${WGT_NAME}.wgt)
        add_dependencies(widget populate packaging_wgt)
-       set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.wgt")
+       set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/${WGT_NAME}.wgt")
 
        if(NOT RSYNC_TARGET)
                message ("${Yellow}.. Warning: RSYNC_TARGET not defined 'make widget-target-install' not instanciated${ColourReset}")
@@ -520,7 +533,7 @@ macro(project_subdirs_add)
        foreach(filename ${filelist})
                if(EXISTS "${filename}/CMakeLists.txt")
                        add_subdirectory(${filename})
-               elseif(${filename} MATCHES "^.*cmake$")
+               elseif(${filename} MATCHES "^.*\\.cmake$")
                        include(${filename})
                endif(EXISTS "${filename}/CMakeLists.txt")
        endforeach()