summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-07-07 13:04:52 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2018-10-15 18:22:47 +0200
commitf0446b41122e74533fbb165dfcb7f2aaae025caf (patch)
tree9d329efe2dd3d42e776e34de7ee45f16c71d875d /cmake
parent6f2a90b284d699fcb4a858523ee3952d182401a0 (diff)
Fix: cleaning generated additionals files
Change-Id: I979b699e6ce090b354d6271c549111c2bd44cd2d Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/cmake.d/02-macros.cmake5
1 files changed, 2 insertions, 3 deletions
diff --git a/cmake/cmake.d/02-macros.cmake b/cmake/cmake.d/02-macros.cmake
index 2a014a1..ace7533 100644
--- a/cmake/cmake.d/02-macros.cmake
+++ b/cmake/cmake.d/02-macros.cmake
@@ -44,7 +44,7 @@ macro(configure_files_in_dir dir)
string(REGEX REPLACE "target" "${RSYNC_TARGET}" destinationfile ${filename})
string(REGEX REPLACE ".in$" "" destinationfile ${destinationfile})
configure_file(${file} ${CMAKE_CURRENT_BINARY_DIR}/target/${destinationfile})
- set(ADDITIONAL_MAKE_CLEAN_FILES, "${destinationfile}")
+ set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/target/${destinationfile}")
endforeach()
endmacro(configure_files_in_dir)
@@ -187,7 +187,7 @@ macro(wgt_package_build)
add_custom_target(widget DEPENDS ${PROJECT_NAME}.wgt)
add_dependencies(widget populate packaging_wgt)
- set(ADDITIONAL_MAKE_CLEAN_FILES, "${PROJECT_NAME}.wgt")
+ set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.wgt")
if(NOT RSYNC_TARGET)
message ("${Yellow}.. Warning: RSYNC_TARGET not defined 'make widget-target-install' not instanciated${ColourReset}")
@@ -221,7 +221,6 @@ macro(rpm_package_build)
add_custom_target(rpm DEPENDS ${NPKG_PROJECT_NAME}.spec)
add_dependencies(rpm populate packaging)
- set(ADDITIONAL_MAKE_CLEAN_FILES, "${PROJECT_NAME}.spec")
if(PACKAGE_MESSAGE)
add_custom_command(TARGET rpm