diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2018-10-18 10:23:02 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2018-10-18 11:30:05 +0200 |
| commit | d6c7b9663f735fc29e68bfb7a55b2025a6a650ad (patch) | |
| tree | fcee2e3d6d201e2fe5f6c742aef402f86081f6fa /cmake/cmake.d | |
| parent | 35065ca3a59d327e68b18b5cf2080fb940b6ee4d (diff) | |
Minor fixes
- CMake module name has changed so the warning message needs to be updated
- Reset the shell color at the end of the warning message.
- Wrong variable used to add target's property
- Complete path to cmake script file, there is a difference between cmake module and
git submodule version
Change-Id: Ia730773cbefef485982da03dbf1281b29485ea51
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'cmake/cmake.d')
| -rw-r--r-- | cmake/cmake.d/03-macros.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake index e483a4a..d4fdf7d 100644 --- a/cmake/cmake.d/03-macros.cmake +++ b/cmake/cmake.d/03-macros.cmake @@ -367,7 +367,7 @@ macro(project_targets_populate) endif() list(APPEND BINDINGS_LIST "${P}${OUT}${S}") generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_LIBDIR}) - SET_TARGET_PROPERTIES(${T} PROPERTIES + SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_FLAGS ${BINDINGS_LINK_FLAG} ) elseif(${T} STREQUAL "BINDINGV2") @@ -376,7 +376,7 @@ macro(project_targets_populate) endif() afb_genskel("-2") generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_LIBDIR}) - SET_TARGET_PROPERTIES(${T} PROPERTIES + SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_FLAGS ${BINDINGS_LINK_FLAG} ) elseif(${T} STREQUAL "BINDINGV3") @@ -385,7 +385,7 @@ macro(project_targets_populate) endif() afb_genskel("-3") generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_LIBDIR}) - SET_TARGET_PROPERTIES(${T} PROPERTIES + SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_FLAGS ${BINDINGS_LINK_FLAG} ) elseif(${T} STREQUAL "EXECUTABLE") @@ -542,7 +542,7 @@ macro(wgt_package_build) COMMAND cp ${ICON_PATH} ${PROJECT_PKG_BUILD_DIR}/${PROJECT_ICON} ) add_custom_command(OUTPUT ${PROJECT_PKG_TEST_DIR}/config.xml ${PROJECT_PKG_TEST_DIR}/bin/launcher - COMMAND ${CMAKE_COMMAND} -DINFILE=${TEST_WIDGET_CONFIG_TEMPLATE} -DOUTFILE=${PROJECT_PKG_TEST_DIR}/config.xml -DPROJECT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${PROJECT_APP_TEMPLATES_DIR}/cmake/configure_file.cmake + COMMAND ${CMAKE_COMMAND} -DINFILE=${TEST_WIDGET_CONFIG_TEMPLATE} -DOUTFILE=${PROJECT_PKG_TEST_DIR}/config.xml -DPROJECT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/cmake/configure_file.cmake COMMAND mkdir -p ${PROJECT_PKG_TEST_DIR}/bin COMMAND cp ${ICON_PATH} ${PROJECT_PKG_TEST_DIR}/${PROJECT_ICON} COMMAND cp ${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/test-widget/launcher.sh.in ${PROJECT_PKG_TEST_DIR}/bin/launcher |