From b9f1f36e653dd2e5a660421b235d8c5be1c34963 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 27 Jun 2017 17:15:43 +0200 Subject: [PATCH] Back to previous populate http and data behavior Change-Id: I3ecd7f4175925ee48a394ea3bfc233bb016098be Signed-off-by: Romain Forlot --- cmake/cmake.d/02-macros.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cmake/cmake.d/02-macros.cmake b/cmake/cmake.d/02-macros.cmake index 0415e54..a04b915 100644 --- a/cmake/cmake.d/02-macros.cmake +++ b/cmake/cmake.d/02-macros.cmake @@ -97,8 +97,7 @@ macro(project_targets_populate) DEPENDS ${TARGET} COMMAND mkdir -p ${PACKAGE_HTTPDIR} COMMAND touch ${PACKAGE_HTTPDIR} - COMMAND cp -r ${SD}/* ${PACKAGE_HTTPDIR} - COMMAND rm -f ${PACKAGE_HTTPDIR}/CMakeLists.txt + COMMAND cp -r ${BD}/${P}${OUT}/* ${PACKAGE_HTTPDIR} ) add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_HTTPDIR}-xx) add_dependencies(populate ${POPULE_PACKAGE_TARGET}) @@ -107,8 +106,7 @@ macro(project_targets_populate) DEPENDS ${TARGET} COMMAND mkdir -p ${PACKAGE_DATADIR} COMMAND touch ${PACKAGE_DATADIR} - COMMAND cp -r ${SD}/* ${PACKAGE_DATADIR} - COMMAND rm -f ${PACKAGE_DATADIR}/CMakeLists.txt + COMMAND cp -r ${BD}/${P}${OUT}/* ${PACKAGE_DATADIR} ) add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_DATADIR}-xx) add_dependencies(populate ${POPULE_PACKAGE_TARGET}) -- 2.16.6