From edf8ab4822277349fdcc3daa42f38dbf8134af36 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 3 May 2021 18:55:42 -0700 Subject: [PATCH] Renaming CPack.cmake to Packaging.cmake to avoid infinite recursion (Packaging.cmake includes CPack.cmake) (#533) --- CMakeLists.txt | 2 +- cmake/{CPack.cmake => Packaging.cmake} | 0 cmake/cmake_files.cmake | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename cmake/{CPack.cmake => Packaging.cmake} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 868757ebcd..ae8a7a05f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,5 +127,5 @@ if(NOT INSTALLED_ENGINE) ly_setup_o3de_install() # IMPORTANT: must be included last - include(cmake/CPack.cmake) + include(cmake/Packaging.cmake) endif() diff --git a/cmake/CPack.cmake b/cmake/Packaging.cmake similarity index 100% rename from cmake/CPack.cmake rename to cmake/Packaging.cmake diff --git a/cmake/cmake_files.cmake b/cmake/cmake_files.cmake index 5045a42cbe..e423eb0dbc 100644 --- a/cmake/cmake_files.cmake +++ b/cmake/cmake_files.cmake @@ -14,7 +14,6 @@ set(FILES 3rdPartyPackages.cmake CommandExecution.cmake Configurations.cmake - CPack.cmake Dependencies.cmake Deployment.cmake EngineFinder.cmake @@ -27,6 +26,7 @@ set(FILES LYPython.cmake LYWrappers.cmake Monolithic.cmake + Packaging.cmake PAL.cmake PALTools.cmake Projects.cmake