birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolved conflicts in merge from stabilization/2106 -> development.

Browse Source 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
This commit is contained in:
Chris Galvan
2021-08-11 15:33:50 -05:00
parent 2564e8f8dc 4b817a6483
commit 5b0046ce78
5 changed files with 148 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Packaging.cmake
+1 -1
View File
@@ -129,7 +129,7 @@ install(FILES ${_cmake_package_dest}
# the version string and git tags are intended to be synchronized so it should be safe to use that instead
# of directly calling into git which could get messy in certain scenarios
if(${CPACK_PACKAGE_VERSION} VERSION_GREATER "0.0.0.0")
set(_3rd_party_license_filename SPDX-Licenses.txt)
set(_3rd_party_license_filename NOTICES.txt)
set(_3rd_party_license_url "https://raw.githubusercontent.com/o3de/3p-package-source/${CPACK_PACKAGE_VERSION}/${_3rd_party_license_filename}")
set(_3rd_party_license_dest ${CPACK_BINARY_DIR}/${_3rd_party_license_filename})
cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
+5 -5
View File
@@ -4,15 +4,15 @@
<Window Width="672" Height="500" HexStyle="100a0000" FontId="2">#(loc.WindowTitle)</Window>
<!-- header font -->
<Font Id="0" Height="-24" Weight="500" Foreground="000000">Open Sans</Font>
<Font Id="0" Height="-24" Weight="500" Foreground="000000">Segoe UI</Font>
<!-- body font -->
<Font Id="1" Height="-12" Weight="500" Foreground="000000">Open Sans</Font>
<Font Id="1" Height="-12" Weight="500" Foreground="000000">Segoe UI</Font>
<!-- special font -->
<Font Id="2" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Open Sans</Font>
<Font Id="2" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
<!-- throwaway font for button bar -->
<Font Id="3" Height="-12" Weight="500" Foreground="EEEEEE" Background="EEEEEE">Open Sans</Font>
<Font Id="3" Height="-12" Weight="500" Foreground="EEEEEE" Background="EEEEEE">Segoe UI</Font>
<!-- special font for install warning title -->
<Font Id="4" Height="-14" Weight="500" Foreground="000000">Open Sans</Font>
<Font Id="4" Height="-14" Weight="500" Foreground="000000">Segoe UI</Font>
<!-- top banner -->
<Image X="28" Y="24" Width="168" Height="64" ImageFile="logo.png" Visible="yes"/>