From aadc72aafb3866c489a139e6bdba8daa54a09305 Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Thu, 29 Apr 2021 19:08:45 -0700
Subject: [PATCH] [cpack_installer] replace cpack generator with zip for now

---
 cmake/CPack.cmake | 35 +----------------------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/cmake/CPack.cmake b/cmake/CPack.cmake
index 687021587b..25fddb90d0 100644
--- a/cmake/CPack.cmake
+++ b/cmake/CPack.cmake
@@ -13,24 +13,7 @@ if(NOT PAL_TRAIT_BUILD_CPACK_SUPPORTED)
     return()
 endif()
 
-set(LY_QTIFW_PATH "" CACHE PATH "Path to the Qt Installer Framework install path")
-
-if(LY_QTIFW_PATH)
-    file(TO_CMAKE_PATH ${LY_QTIFW_PATH} CPACK_IFW_ROOT)
-elseif(DEFINED ENV{QTIFWDIR})
-    file(TO_CMAKE_PATH $ENV{QTIFWDIR} CPACK_IFW_ROOT)
-endif()
-
-if(CPACK_IFW_ROOT)
-    if(NOT EXISTS ${CPACK_IFW_ROOT})
-        message(FATAL_ERROR "Invalid path supplied for LY_QTIFW_PATH argument or QTIFWDIR environment variable")
-    endif()
-else()
-    # early out as no path to QtIFW has been supplied effectively disabling support
-    return()
-endif()
-
-set(CPACK_GENERATOR "IFW")
+set(CPACK_GENERATOR "ZIP")
 
 set(CPACK_PACKAGE_VENDOR "${PROJECT_NAME}")
 set(CPACK_PACKAGE_VERSION "${LY_VERSION_STRING}")
@@ -44,15 +27,8 @@ set(DEFAULT_LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
 
 set(CPACK_RESOURCE_FILE_LICENSE ${DEFAULT_LICENSE_FILE})
 
-set(CPACK_IFW_PACKAGE_TITLE "${PROJECT_NAME} Installer")
-set(CPACK_IFW_PACKAGE_PUBLISHER "${PROJECT_NAME}")
-
-set(CPACK_IFW_TARGET_DIRECTORY "@ApplicationsDir@/${PROJECT_NAME}/${LY_VERSION_STRING}")
-set(CPACK_IFW_PACKAGE_START_MENU_DIRECTORY "${PROJECT_NAME}")
-
 # IMPORTANT: required to be included AFTER setting all property overrides
 include(CPack REQUIRED)
-include(CPackIFW REQUIRED)
 
 function(ly_configure_cpack_component ly_configure_cpack_component_NAME)
 
@@ -64,11 +40,9 @@ function(ly_configure_cpack_component ly_configure_cpack_component_NAME)
 
     # default to optional
     set(component_type DISABLED)
-    set(ifw_component_type)
 
     if(ly_configure_cpack_component_REQUIRED)
         set(component_type REQUIRED)
-        set(ifw_component_type FORCED_INSTALLATION)
     endif()
 
     set(license_name ${DEFAULT_LICENSE_NAME})
@@ -86,13 +60,6 @@ function(ly_configure_cpack_component ly_configure_cpack_component_NAME)
         DISPLAY_NAME ${ly_configure_cpack_component_DISPLAY_NAME}
         DESCRIPTION ${ly_configure_cpack_component_DESCRIPTION}
     )
-
-    cpack_ifw_configure_component(
-        ${ly_configure_cpack_component_NAME} ${ifw_component_type}
-        LICENSES
-            ${license_name}
-            ${license_file}
-    )
 endfunction()
 
 # configure ALL components here