From 1d2d57fea4a08f0a31eb207105abe7058bea4fcf Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Wed, 3 May 2017 18:21:37 +0200 Subject: [PATCH 1/1] Align on CMake template from app-template repo Change-Id: Id44c5e4917f646177f5262bb74c9ccb3a588d25b Signed-off-by: Romain Forlot --- CAN-binder/etc/macros.cmake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CAN-binder/etc/macros.cmake b/CAN-binder/etc/macros.cmake index 7bacc7f5..afad28a6 100644 --- a/CAN-binder/etc/macros.cmake +++ b/CAN-binder/etc/macros.cmake @@ -124,6 +124,7 @@ macro(build_widget) COMMAND wgtpkg-pack -f -o ${PROJECT_NAME}.wgt ${WIDGET_DIR} ) add_custom_target(widget DEPENDS ${PROJECT_NAME}.wgt) + set(ADDITIONAL_MAKE_CLEAN_FILES, "${PROJECT_NAME}.wgt") else() MESSAGE(FATAL_ERROR "Widget tree empty, please populate it by calling populate_widget() macro with target you want to include into it.") endif("${PROJECT_TARGETS}" MATCHES "populate_") @@ -196,7 +197,7 @@ CHECK_LIBRARY_EXISTS(efence malloc "" HAVE_LIBEFENCE) IF(HAVE_LIBEFENCE) MESSAGE(STATUS "Linking with ElectricFence for debugging purposes...") SET(libefence_LIBRARIES "-lefence") - list (APPEND link_libraries libefence_LIBRARIES}) + list (APPEND link_libraries ${libefence_LIBRARIES}) ENDIF(HAVE_LIBEFENCE) ENDIF(CMAKE_BUILD_TYPE MATCHES DEBUG) @@ -254,5 +255,3 @@ if(CLOSING_MESSAGE AND GLOBAL_TARGET_LIST) COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${CLOSING_MESSAGE}" ) endif() - -set(ADDITIONAL_MAKE_CLEAN_FILES, "low-can-binding/low-can-binding.wgt") -- 2.16.6