From 2577b55681a97f3eec3fb0e3b5a4fb7f2cb18b8a Mon Sep 17 00:00:00 2001 From: manuel Date: Thu, 30 Aug 2018 00:42:04 +0200 Subject: sync with upstream --- cmake/scripts/windowsstore/Macros.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'cmake/scripts/windowsstore/Macros.cmake') diff --git a/cmake/scripts/windowsstore/Macros.cmake b/cmake/scripts/windowsstore/Macros.cmake index 7240138..de89c62 100644 --- a/cmake/scripts/windowsstore/Macros.cmake +++ b/cmake/scripts/windowsstore/Macros.cmake @@ -70,11 +70,11 @@ macro(winstore_set_assets target) set_property(SOURCE ${ASSET_FILES} PROPERTY VS_DEPLOYMENT_CONTENT 1) set_property(SOURCE ${ASSET_FILES} PROPERTY VS_DEPLOYMENT_LOCATION "media") source_group("media" FILES ${ASSET_FILES}) - set(RESOURCES ${RESOURCES} ${ASSET_FILES} + set(RESOURCES ${RESOURCES} ${ASSET_FILES} "${CMAKE_SOURCE_DIR}/tools/windows/packaging/uwp/kodi_temp_key.pfx") - set(LICENSE_FILES - ${CMAKE_SOURCE_DIR}/LICENSE.GPL - ${CMAKE_SOURCE_DIR}/copying.txt + + set(LICENSE_FILES + ${CMAKE_SOURCE_DIR}/LICENSE.md ${CMAKE_SOURCE_DIR}/privacy-policy.txt) if(EXISTS "${CMAKE_SOURCE_DIR}/known_issues.txt") list(APPEND LICENSE_FILES ${CMAKE_SOURCE_DIR}/known_issues.txt) @@ -108,7 +108,7 @@ macro(add_deployment_content_group path link match exclude) " ${_link}%(RecursiveDir)%(FileName)%(Extension)\n" " true\n" " \n") -endmacro() +endmacro() macro(winstore_append_props target) # exclude debug dlls from packaging @@ -126,7 +126,7 @@ macro(winstore_append_props target) " \n" " \n") endforeach(_dll DEBUG_DLLS) - + add_deployment_content_group($(BuildRootPath)/dlls "" *.dll "${DEBUG_DLLS_EXCLUDE}") add_deployment_content_group($(BuildRootPath)/system system **/* "$(BuildRootPath)/**/shaders/**") add_deployment_content_group($(BuildRootPath)/system/shaders system/shaders **/*.fx "") @@ -179,4 +179,4 @@ macro(winstore_add_target_properties target) winstore_set_assets(${target}) winstore_generate_manifest(${target}) winstore_append_props(${target}) -endmacro() \ No newline at end of file +endmacro() -- cgit v1.2.3