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

[cpack_installer] removed static cmake package in favor of using file(DOWNLOAD ...)

Browse Source
This commit is contained in:
scottr
2021-05-26 20:19:42 -07:00
parent cccb68fa38
commit 883ddf667e
5 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Platform/Common/Install_common.cmake
+1 -1
View File
@@ -286,7 +286,7 @@ endfunction()
function(ly_setup_others)
# List of directories we want to install relative to engine root
set(DIRECTORIES_TO_INSTALL Tools/LyTestTools Tools/RemoteConsole Tools/Redistributables/CMake)
set(DIRECTORIES_TO_INSTALL Tools/LyTestTools Tools/RemoteConsole)
foreach(dir ${DIRECTORIES_TO_INSTALL})
get_filename_component(install_path ${dir} DIRECTORY)
cmake/Platform/Windows/Packaging/PostInstallSetup.wxs
+2 -4
View File
@@ -43,16 +43,14 @@
</Directory>
</DirectoryRef>
<Property Id="CMakeArchvieName" Value="cmake-3.19.1-win64-x64"/>
<CustomAction Id="ExtractCMake"
ExeCommand="&quot;[SystemFolder]cmd.exe&quot; /C tar -x -f &quot;[root.tools.redist.cmake][CMakeArchvieName].zip&quot; -C &quot;[root.tools.redist]CMake&quot;"
ExeCommand="&quot;[SystemFolder]cmd.exe&quot; /C tar -x -f &quot;[root.tools.redist.cmake]$(var.CPACK_CMAKE_PACKAGE_NAME).zip&quot; -C &quot;[root.tools.redist]CMake&quot;"
Directory="INSTALL_ROOT"
Execute="deferred"
Impersonate="no"/>
<CustomAction Id="MoveCMake"
ExeCommand="&quot;[SystemFolder]cmd.exe&quot; /C move &quot;[root.tools.redist.cmake][CMakeArchvieName]&quot; &quot;[root.cmake]runtime&quot;"
ExeCommand="&quot;[SystemFolder]cmd.exe&quot; /C move &quot;[root.tools.redist.cmake]$(var.CPACK_CMAKE_PACKAGE_NAME)&quot; &quot;[root.cmake]runtime&quot;"
Directory="INSTALL_ROOT"
Execute="deferred"
Impersonate="no"/>
cmake/Platform/Windows/Packaging_windows.cmake
+5
View File
@@ -28,6 +28,10 @@ endif()
set(CPACK_GENERATOR "WIX")
set(_cmake_package_name "cmake-${CPACK_DESIRED_CMAKE_VERSION}-windows-x86_64")
set(CPACK_CMAKE_PACKAGE_FILE "${_cmake_package_name}.zip")
set(CPACK_CMAKE_PACKAGE_HASH "15a49e2ab81c1822d75b1b1a92f7863f58e31f6d6aac1c4103eef2b071be3112")
# CPack will generate the WiX product/upgrade GUIDs further down the chain if they weren't supplied
# however, they are unique for each run. instead, let's do the auto generation here and add it to
# the cache for run persistence and have the ability to detect if they are still being used.
@@ -106,4 +110,5 @@ endif()
set(CPACK_WIX_CANDLE_EXTRA_FLAGS
-dCPACK_EMBED_ARTIFACTS=${_embed_artifacts}
-dCPACK_CMAKE_PACKAGE_NAME=${_cmake_package_name}
)