Merge b0cdfd71894926205d2628350943ab9395c8cefe into fe7bd75c9170c1db5dc2bc4f54d80b29cad87676

This commit is contained in:
Noel Eck 2018-02-12 04:02:50 +00:00 committed by GitHub
commit 78e981f40e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1058 additions and 190 deletions

View File

@ -405,6 +405,7 @@ if (IPK)
set(CPACK_DEBIAN_PACKAGE_REPLACES ${CPACK_DEBIAN_PACKAGE_PROVIDES}) set(CPACK_DEBIAN_PACKAGE_REPLACES ${CPACK_DEBIAN_PACKAGE_PROVIDES})
set(CPACK_DEBIAN_PACKAGE_CONFLICTS ${CPACK_DEBIAN_PACKAGE_PROVIDES}) set(CPACK_DEBIAN_PACKAGE_CONFLICTS ${CPACK_DEBIAN_PACKAGE_PROVIDES})
set(WDIR "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}") set(WDIR "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}")
set(CPACK_DEBIAN_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_${TARGET_ARCH}.ipk")
include (CPack) include (CPack)
endif() endif()

File diff suppressed because it is too large Load Diff