X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmake%2Fcommon.cmake;h=ee959064a8eced99c808daf3616ac3d0b9f0745b;hb=b370e2d20d131478dc593ee31a2dff5d8d3f9024;hp=fa7b369b528a9ee031c94469c2bd2fc952d0813e;hpb=8ca8aa2c6182de0980956d4dbab68750e85ca58f;p=apps%2Fapp-templates.git diff --git a/cmake/common.cmake b/cmake/common.cmake index fa7b369..ee95906 100644 --- a/cmake/common.cmake +++ b/cmake/common.cmake @@ -79,15 +79,15 @@ endmacro(defstr) # Pre-packaging macro(project_targets_populate) - # Default Widget default directory - set(PACKAGE_BINDIR ${PROJECT_PKG_BUILD_DIR}/bin) - set(PACKAGE_ETCDIR ${PROJECT_PKG_BUILD_DIR}/etc) - set(PACKAGE_LIBDIR ${PROJECT_PKG_BUILD_DIR}/lib) - set(PACKAGE_HTTPDIR ${PROJECT_PKG_BUILD_DIR}/htdocs) - set(PACKAGE_DATADIR ${PROJECT_PKG_BUILD_DIR}/data) + # Default Widget default directory + set(PACKAGE_BINDIR ${PROJECT_PKG_BUILD_DIR}/bin) + set(PACKAGE_ETCDIR ${PROJECT_PKG_BUILD_DIR}/etc) + set(PACKAGE_LIBDIR ${PROJECT_PKG_BUILD_DIR}/lib) + set(PACKAGE_HTTPDIR ${PROJECT_PKG_BUILD_DIR}/htdocs) + set(PACKAGE_DATADIR ${PROJECT_PKG_BUILD_DIR}/data) add_custom_target(populate) - get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS) + get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS) foreach(TARGET ${PROJECT_TARGETS}) get_target_property(T ${TARGET} LABELS) if(T) @@ -123,20 +123,22 @@ macro(project_targets_populate) add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_BINDIR}/${P}${TARGET}) add_dependencies(populate ${POPULE_PACKAGE_TARGET}) elseif(${T} STREQUAL "HTDOCS") - add_custom_command(OUTPUT ${PACKAGE_HTTPDIR} + add_custom_command(OUTPUT ${PACKAGE_HTTPDIR}-xx DEPENDS ${TARGET} COMMAND mkdir -p ${PACKAGE_HTTPDIR} + COMMAND touch ${PACKAGE_HTTPDIR} COMMAND cp -r ${BD}/${P}${OUT}/* ${PACKAGE_HTTPDIR} ) - add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_HTTPDIR}) + add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_HTTPDIR}-xx) add_dependencies(populate ${POPULE_PACKAGE_TARGET}) elseif(${T} STREQUAL "DATA") - add_custom_command(OUTPUT ${PACKAGE_DATADIR} + add_custom_command(OUTPUT ${PACKAGE_DATADIR}-xx DEPENDS ${TARGET} COMMAND mkdir -p ${PACKAGE_DATADIR} + COMMAND touch ${PACKAGE_DATADIR} COMMAND cp -r ${BD}/${P}${OUT} ${PACKAGE_DATADIR} ) - add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_DATADIR}) + add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_DATADIR}-xx) add_dependencies(populate ${POPULE_PACKAGE_TARGET}) endif(${T} STREQUAL "BINDING") elseif(${CMAKE_BUILD_TYPE} MATCHES "[Dd][Ee][Bb][Uu][Gg]")