diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2019-06-27 09:43:55 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2019-06-27 09:59:43 +0200 |
| commit | 7593f0f6c5eb54e4514ed61d6c06125bfc28ccfd (patch) | |
| tree | 1f84008a869dd9828735a384e11b0cf6800987a0 | |
| parent | 4e1d47b990778978f275c1a580e454002a9bdc23 (diff) | |
Recurse path when using fallback zip tool
Recurse path when using fallback zip tool instead of the
application framework widget creator tool wgtpkg-pack.
Bug-AGL: SPEC-2577
Change-Id: I2bf044fd921ab2debe7fcd6ed12446bffcb99941
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| -rw-r--r-- | src/cmake/cmake.d/03-macros.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cmake/cmake.d/03-macros.cmake b/src/cmake/cmake.d/03-macros.cmake index 3ca6311..9280191 100644 --- a/src/cmake/cmake.d/03-macros.cmake +++ b/src/cmake/cmake.d/03-macros.cmake @@ -582,8 +582,8 @@ You need a config.xml template: please specify WIDGET_CONFIG_TEMPLATE correctly. else() find_program(wgtpkgCMD "zip") if(wgtpkgCMD) - set(packCMD ${CMAKE_COMMAND} -E cmake_echo_color --yellow "Warning: Widget will be built using Zip, NOT using the Application Framework widget pack command." && cd ${PROJECT_PKG_BUILD_DIR} && ${wgtpkgCMD} "../${WGT_NAME}.wgt" "*") - set(packCMDTest ${CMAKE_COMMAND} -E cmake_echo_color --yellow "Warning: Test widget will be built using Zip, NOT using the Application Framework widget pack command." && cd ${PROJECT_PKG_TEST_DIR} && ${wgtpkgCMD} "../${WGT_NAME}-test.wgt" "*") + set(packCMD ${CMAKE_COMMAND} -E cmake_echo_color --yellow "Warning: Widget will be built using Zip, NOT using the Application Framework widget pack command." && cd ${PROJECT_PKG_BUILD_DIR} && ${wgtpkgCMD} -r "../${WGT_NAME}.wgt" "*") + set(packCMDTest ${CMAKE_COMMAND} -E cmake_echo_color --yellow "Warning: Test widget will be built using Zip, NOT using the Application Framework widget pack command." && cd ${PROJECT_PKG_TEST_DIR} && ${wgtpkgCMD} -r "../${WGT_NAME}-test.wgt" "*") else() set(packCMD ${CMAKE_COMMAND} -E cmake_echo_color --red "Error: No utility found to build a widget. Either install wgtpkg-pack from App Framework or zip command") endif() |