summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-06-27 17:15:43 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2018-10-15 18:22:47 +0200
commit39af695b2d49c165e53c2e30d07a9507d98717c8 (patch)
tree0ed1d599cb98e6514d1eee0baf4f2068a3f400f4 /cmake
parent83e0e3039ffa42c63273e82eac7e62e6108a733e (diff)
Back to previous populate http and data behavior
Change-Id: I3ecd7f4175925ee48a394ea3bfc233bb016098be Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/cmake.d/02-macros.cmake6
1 files 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})