WIP checkpoint

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-17 12:36:09 -07:00
parent a8908a987a
commit 99a009bb77
7 changed files with 101 additions and 67 deletions
@@ -105,18 +105,24 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME absolute_tar
            RUNTIME_SUBDIR ${target_runtime_output_subdirectory}
        )
    else()
-        install(
-            TARGETS ${TARGET_NAME}
-            ARCHIVE
-                DESTINATION ${archive_output_directory}
-                COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
-            LIBRARY
-                DESTINATION ${library_output_directory}/${target_library_output_subdirectory}
-                COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
-            RUNTIME
-                DESTINATION ${runtime_output_directory}/${target_runtime_output_subdirectory}
-                COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
-        )
+        foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES)
+            string(TOUPPER ${conf} UCONF)
+            install(
+                TARGETS ${TARGET_NAME}
+                ARCHIVE
+                    DESTINATION ${archive_output_directory}
+                    COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}_${UCONF}
+                    CONFIGURATIONS ${conf}
+                LIBRARY
+                    DESTINATION ${library_output_directory}/${target_library_output_subdirectory}
+                    COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}_${UCONF}
+                    CONFIGURATIONS ${conf}
+                RUNTIME
+                    DESTINATION ${runtime_output_directory}/${target_runtime_output_subdirectory}
+                    COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}_${UCONF}
+                    CONFIGURATIONS ${conf}
+            )
+        endforeach()
    endif()

    # CMakeLists.txt related files
@@ -499,12 +505,15 @@ function(ly_setup_runtime_dependencies)
    if(COMMAND ly_install_code_function_override)
        ly_install_code_function_override()
    else()
-        install(CODE
+        foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES)
+            string(TOUPPER ${conf} UCONF)
+            install(CODE
 "function(ly_copy source_file target_directory)
    file(COPY \"\${source_file}\" DESTINATION \"\${target_directory}\" FILE_PERMISSIONS ${LY_COPY_PERMISSIONS})
 endfunction()"
-        COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
-        )
+                COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}_${UCONF}
+            )
+        endforeach()
    endif()

    unset(runtime_commands)
@@ -543,9 +552,15 @@ endfunction()"

    list(REMOVE_DUPLICATES runtime_commands)
    list(JOIN runtime_commands "    " runtime_commands_str) # the spaces are just to see the right identation in the cmake_install.cmake file
-    install(CODE "${runtime_commands_str}" 
-        COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
-    )
+    foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES)
+        string(TOUPPER ${conf} UCONF)
+        install(CODE 
+"if(\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^(${conf})\$\")
+    ${runtime_commands_str}
+endif()" 
+            COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}_${UCONF}
+        )
+    endforeach()

 endfunction()

@@ -21,7 +21,7 @@
    <Page Name="Install">
        <Text X="38" Y="142" Width="-42" Height="34" FontId="0" DisablePrefix="yes">#(loc.InstallHeader)</Text>

-@WIX_THEME_INSTALL_LICENSE_ELEMENTS@
+<!--@WIX_THEME_INSTALL_LICENSE_ELEMENTS@-->

        <Text X="0" Y="426" Width="672" Height="46" FontId="3" HideWhenDisabled="yes" />
        <Button Name="OptionsButton" X="-190" Y="-10" Width="80" Height="24" TabStop="yes" FontId="2" HideWhenDisabled="yes">#(loc.InstallOptionsButton)</Button>
@@ -33,11 +33,14 @@
    <Page Name="Options">
        <Text X="38" Y="142" Width="-42" Height="34" FontId="0" DisablePrefix="yes">#(loc.OptionsHeader)</Text>

-        <Text X="42" Y="202" Width="-42" Height="18" FontId="1" DisablePrefix="yes">#(loc.OptionsLocationLabel)</Text>
-        <Editbox Name="FolderEditbox" X="42" Y="231" Width="354" Height="21" TabStop="yes" FontId="1" FileSystemAutoComplete="yes" />
-        <Button Name="BrowseButton" X="406" Y="230" Width="80" Height="23" TabStop="yes" FontId="1">#(loc.OptionsBrowseButton)</Button>
-        <Text X="42" Y="262" Width="-42" Height="20" FontId="4" DisablePrefix="yes">#(loc.OptionsWarningTitle)</Text>
-        <Text X="42" Y="282" Width="-42" Height="54" FontId="1" DisablePrefix="yes">#(loc.OptionsWarning)</Text>
+        <Checkbox Name="DebugSDK" X="42" Y="190" Width="-42" Height="20">Include debug SDK</Checkbox>
+        <Checkbox Name="DebugSDK" X="42" Y="210" Width="-42" Height="20">Include release monolithic SDK</Checkbox>
+
+        <Text X="42" Y="240" Width="-42" Height="18" FontId="1" DisablePrefix="yes">#(loc.OptionsLocationLabel)</Text>
+        <Editbox Name="FolderEditbox" X="42" Y="260" Width="354" Height="21" TabStop="yes" FontId="1" FileSystemAutoComplete="yes" />
+        <Button Name="BrowseButton" X="406" Y="260" Width="80" Height="23" TabStop="yes" FontId="1">#(loc.OptionsBrowseButton)</Button>
+        <Text X="42" Y="285" Width="-42" Height="20" FontId="4" DisablePrefix="yes">#(loc.OptionsWarningTitle)</Text>
+        <Text X="42" Y="310" Width="-42" Height="54" FontId="1" DisablePrefix="yes">#(loc.OptionsWarning)</Text>

        <Text X="0" Y="426" Width="672" Height="46" FontId="3" HideWhenDisabled="yes" />
        <Button Name="OptionsOkButton" X="-106" Y="-10" Width="80" Height="24" TabStop="yes" FontId="2">#(loc.OptionsOkButton)</Button>
@@ -23,6 +23,7 @@ set(CPACK_WIX_ROOT ${LY_INSTALLER_WIX_ROOT})

 set(CPACK_GENERATOR WIX)

+set(CPACK_THREADS 0)
 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")
@@ -30,8 +31,8 @@ set(CPACK_CMAKE_PACKAGE_HASH "15a49e2ab81c1822d75b1b1a92f7863f58e31f6d6aac1c4103
 # workaround for shortening the path cpack installs to by stripping the platform directory and forcing monolithic
 # mode to strip out component folders.  this unfortunately is the closest we can get to changing the install location
 # as CPACK_PACKAGING_INSTALL_PREFIX/CPACK_SET_DESTDIR isn't supported for the WiX generator
-set(CPACK_TOPLEVEL_TAG "")
-set(CPACK_MONOLITHIC_INSTALL ON)
+#set(CPACK_TOPLEVEL_TAG "")
+#set(CPACK_MONOLITHIC_INSTALL ON)

 # 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