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

Some var cleanup so it shows better-organized in cmake-gui. Some vars… (#2361)

Browse Source 
* Some var cleanup so it shows better-organized in cmake-gui. Some vars were also not following the namign convention we are using
Removed some unnecessary messaging
Fixed a TIF bug where it would report the wrong test in a message, fixed a message that was being triggered
Changed TIF to be enabled just by the binary so running the ci_build scripts locally doesnt trigger TIF messaging
Removed `LY_ENABLE_MULTIPLAYER_COMPRESSION`, it was not being used

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* handling case where a parameter can be empty

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* needs to be var name, not contents

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-07-26 14:14:56 -07:00
committed by GitHub
parent 7f84a4318c
commit da474357f3
19 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Platform/Windows/Packaging_windows.cmake
+4 -4
View File
@@ -6,11 +6,11 @@
#
#
set(CPACK_WIX_ROOT "" CACHE PATH "Path to the WiX install path")
set(LY_INSTALLER_WIX_ROOT "" CACHE PATH "Path to the WiX install path")
if(CPACK_WIX_ROOT)
if(NOT EXISTS ${CPACK_WIX_ROOT})
message(FATAL_ERROR "Invalid path supplied for CPACK_WIX_ROOT argument")
if(LY_INSTALLER_WIX_ROOT)
if(NOT EXISTS ${LY_INSTALLER_WIX_ROOT})
message(FATAL_ERROR "Invalid path supplied for LY_INSTALLER_WIX_ROOT argument")
endif()
else()
# early out as no path to WiX has been supplied effectively disabling support