diff options
| author | Brad King <brad.king@kitware.com> | 2014-12-03 14:32:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-12-03 14:32:42 (GMT) |
| commit | 1c104c019a23392563befb3564dd5c679cc2c585 (patch) | |
| tree | 891880c5fa7b86c0246d2b7704a9180b0ef12adc /Tests/VSWinStorePhone/CMakeLists.txt | |
| parent | 7c28e7c17205983ef16d72d4ad6f65649355e805 (diff) | |
| parent | 352f246f3ebfd8daf5fda9bad2db01b56fa4bf4d (diff) | |
| download | CMake-1c104c019a23392563befb3564dd5c679cc2c585.zip CMake-1c104c019a23392563befb3564dd5c679cc2c585.tar.gz CMake-1c104c019a23392563befb3564dd5c679cc2c585.tar.bz2 | |
Merge branch 'vs-phone-store-deployment-location' into release
Diffstat (limited to 'Tests/VSWinStorePhone/CMakeLists.txt')
| -rw-r--r-- | Tests/VSWinStorePhone/CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Tests/VSWinStorePhone/CMakeLists.txt b/Tests/VSWinStorePhone/CMakeLists.txt index badb7da..7227fcc 100644 --- a/Tests/VSWinStorePhone/CMakeLists.txt +++ b/Tests/VSWinStorePhone/CMakeLists.txt @@ -86,6 +86,9 @@ if (WINDOWS_PHONE8) elseif (NOT "${PLATFORM}" STREQUAL "DESKTOP") set(CONTENT_FILES ${CONTENT_FILES} ${CMAKE_CURRENT_BINARY_DIR}/${APP_MANIFEST_NAME} + ) + + set(ASSET_FILES ${ASSET_FILES} Direct3DApp1/Assets/Logo.png Direct3DApp1/Assets/SmallLogo.png Direct3DApp1/Assets/SplashScreen.png @@ -94,10 +97,12 @@ elseif (NOT "${PLATFORM}" STREQUAL "DESKTOP") endif() set(RESOURCE_FILES - ${CONTENT_FILES} ${DEBUG_CONTENT_FILES} ${RELEASE_CONTENT_FILES} + ${CONTENT_FILES} ${DEBUG_CONTENT_FILES} ${RELEASE_CONTENT_FILES} ${ASSET_FILES} Direct3DApp1/Direct3DApp1_TemporaryKey.pfx) set_property(SOURCE ${CONTENT_FILES} PROPERTY VS_DEPLOYMENT_CONTENT 1) +set_property(SOURCE ${ASSET_FILES} PROPERTY VS_DEPLOYMENT_CONTENT 1) +set_property(SOURCE ${ASSET_FILES} PROPERTY VS_DEPLOYMENT_LOCATION "Assets") set_property(SOURCE ${DEBUG_CONTENT_FILES} PROPERTY VS_DEPLOYMENT_CONTENT $<CONFIG:Debug>) set_property(SOURCE ${RELEASE_CONTENT_FILES} PROPERTY VS_DEPLOYMENT_CONTENT $<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>,$<CONFIG:MinSizeRel>>) |