Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup UWP CMake for proxyres_cli #50

Merged
merged 2 commits into from
Oct 26, 2023
Merged

Cleanup UWP CMake for proxyres_cli #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f9bb3c
Deploy UWP assets to Assets dir using CMake.
nmoinvaz Oct 26, 2023
2c646f5
Remove unused temporary key.
nmoinvaz Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@ if(PROXYRES_BUILD_CLI)
set(PROXYCLI_SRCS proxycli.c)

if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
list(APPEND PROXYCLI_SRCS
set(PROXYCLI_ASSETS
uwp/Square44x44Logo.png
uwp/Square150x150Logo.png
uwp/StoreLogo.png
uwp/Package.appxmanifest
uwp/Windows_TemporaryKey.pfx)
uwp/Package.appxmanifest)

set_source_files_properties(${PROXYCLI_ASSETS} PROPERTIES
VS_DEPLOYMENT_CONTENT 1
VS_DEPLOYMENT_LOCATION "Assets")
endif()

add_executable(proxycli ${PROXYCLI_SRCS})
add_executable(proxycli ${PROXYCLI_SRCS} ${PROXYCLI_ASSETS})
target_link_libraries(proxycli PRIVATE proxyres)

if(TARGET CURL::libcurl)
Expand Down
8 changes: 4 additions & 4 deletions test/uwp/Package.appxmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
IgnorableNamespaces="uap mp">
<Identity Name="proxycli" Publisher="CN=CMake" Version="1.0.0.0" />
<Identity Name="proxycli" Publisher="CN=CMake Test Cert" Version="1.0.0.0" />
<mp:PhoneIdentity PhoneProductId="44aa77dd-e529-4e34-afee-b47dc9485484"
PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>proxycli</DisplayName>
<PublisherDisplayName>CMake</PublisherDisplayName>
<Logo>StoreLogo.png</Logo>
<Logo>Assets\StoreLogo.png</Logo>
</Properties>
<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
Expand All @@ -26,8 +26,8 @@
desktop4:Subsystem="console"
desktop4:SupportsMultipleInstances="true">
<uap:VisualElements DisplayName="proxycli"
Square150x150Logo="Square150x150Logo.png"
Square44x44Logo="Square44x44Logo.png"
Square150x150Logo="Assets\Square150x150Logo.png"
Square44x44Logo="Assets\Square44x44Logo.png"
Description="proxycli"
BackgroundColor="transparent">
</uap:VisualElements>
Expand Down
Binary file removed test/uwp/Windows_TemporaryKey.pfx
View file
Open in desktop
Binary file not shown.
Loading