Some var cleanup so it shows better-organized in cmake-gui. Some vars… (#2361)
* 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
GitHub
Vendored
+2
-4
@@ -44,7 +44,7 @@ foreach(test_path ${WWISE_SDK_PATHS})
|
||||
is_valid_sdk(${test_path} found_sdk)
|
||||
if(found_sdk)
|
||||
# Update the Wwise Install Path cache variable
|
||||
set(LY_WWISE_INSTALL_PATH "${test_path}" CACHE PATH "Path to Wwise version ${WWISE_VERSION} installation." FORCE)
|
||||
set(LY_WWISE_INSTALL_PATH "${test_path}")
|
||||
break()
|
||||
endif()
|
||||
endforeach()
|
||||
@@ -52,12 +52,10 @@ endforeach()
|
||||
if(NOT found_sdk)
|
||||
# If we don't find a path that appears to be a valid Wwise install, we can bail here.
|
||||
# No 3rdParty::Wwise target will exist, so that can be checked elsewhere.
|
||||
message(STATUS "Wwise SDK version ${WWISE_VERSION} was not found.")
|
||||
return()
|
||||
else()
|
||||
message(STATUS "Using Wwise SDK at ${LY_WWISE_INSTALL_PATH}")
|
||||
endif()
|
||||
|
||||
message(STATUS "Using Wwise SDK at ${LY_WWISE_INSTALL_PATH}")
|
||||
|
||||
set(WWISE_COMMON_LIB_NAMES
|
||||
# Core AK
|
||||
|
||||
@@ -9,6 +9,6 @@
|
||||
# Define options that control the different options for deployment for target platforms
|
||||
|
||||
set(LY_ASSET_DEPLOY_MODE "LOOSE" CACHE STRING "Set the Asset deployment when deploying to the target platform (LOOSE, PAK, VFS)")
|
||||
set(LY_OVERRIDE_PAK_FOLDER_ROOT "" CACHE STRING "Optional root path to where Pak file folders are stored. By default, blank will use a predefined 'paks' root.")
|
||||
set(LY_ASSET_OVERRIDE_PAK_FOLDER_ROOT "" CACHE STRING "Optional root path to where Pak file folders are stored. By default, blank will use a predefined 'paks' root.")
|
||||
|
||||
|
||||
|
||||
@@ -10,7 +10,8 @@
|
||||
|
||||
include_guard()
|
||||
|
||||
set(LY_EXTERNAL_SUBDIRS "" CACHE STRING "List of subdirectories to recurse into when running cmake against the engine's CMakeLists.txt")
|
||||
set(LY_EXTERNAL_SUBDIRS "" CACHE STRING "Additional list of subdirectory to recurse into via the cmake `add_subdirectory()` command. \
|
||||
The subdirectories are included after the restricted platform folders have been visited by a call to `add_subdirectory(restricted/\${restricted_platform})`")
|
||||
|
||||
#! read_engine_external_subdirs
|
||||
# Read the external subdirectories from the engine.json file
|
||||
|
||||
@@ -110,7 +110,7 @@ platform=${PAL_PLATFORM_NAME}
|
||||
game_projects=${LY_PROJECTS_TARGET_NAME}
|
||||
asset_deploy_mode=${LY_ASSET_DEPLOY_MODE}
|
||||
asset_deploy_type=${LY_ASSET_DEPLOY_ASSET_TYPE}
|
||||
override_pak_root=${LY_OVERRIDE_PAK_FOLDER_ROOT}
|
||||
override_pak_root=${LY_ASSET_OVERRIDE_PAK_FOLDER_ROOT}
|
||||
")
|
||||
|
||||
endfunction()
|
||||
|
||||
@@ -8,8 +8,6 @@
|
||||
|
||||
include_guard()
|
||||
|
||||
set(LY_EXTERNAL_SUBDIRS "" CACHE STRING "List of subdirectories to recurse into when running cmake against the engine's CMakeLists.txt")
|
||||
|
||||
#! read_json_external_subdirs
|
||||
# Read the "external_subdirectories" array from a *.json file
|
||||
# External subdirectories are any folders with CMakeLists.txt in them
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -6,11 +6,8 @@
|
||||
#
|
||||
#
|
||||
|
||||
# Switch to enable/disable test impact analysis (and related build targets)
|
||||
option(LY_TEST_IMPACT_ACTIVE "Enable test impact framework" OFF)
|
||||
|
||||
# Path to test instrumentation binary
|
||||
option(LY_TEST_IMPACT_INSTRUMENTATION_BIN "Path to test impact framework instrumentation binary" OFF)
|
||||
set(LY_TEST_IMPACT_INSTRUMENTATION_BIN "" CACHE PATH "Path to test impact framework instrumentation binary")
|
||||
|
||||
# Name of test impact framework console static library target
|
||||
set(LY_TEST_IMPACT_CONSOLE_STATIC_TARGET "TestImpact.Frontend.Console.Static")
|
||||
@@ -213,9 +210,9 @@ function(ly_test_impact_extract_python_test_params COMPOSITE_TEST COMPOSITE_SUIT
|
||||
list(GET suite_components 2 test_timeout)
|
||||
# Get python script path relative to repo root
|
||||
ly_test_impact_rebase_file_to_repo_root(
|
||||
${script_path}
|
||||
"${script_path}"
|
||||
script_path
|
||||
${LY_ROOT_FOLDER}
|
||||
"${LY_ROOT_FOLDER}"
|
||||
)
|
||||
set(suite_params "{ \"suite\": \"${test_suite}\", \"script\": \"${script_path}\", \"timeout\": ${test_timeout} }")
|
||||
list(APPEND test_suites "${suite_params}")
|
||||
@@ -259,7 +256,8 @@ function(ly_test_impact_write_test_enumeration_file TEST_ENUMERATION_TEMPLATE_FI
|
||||
ly_test_impact_extract_google_test_params(${test} "${test_params}" test_name test_suites)
|
||||
list(APPEND google_benchmarks " { \"name\": \"${test_name}\", \"launch_method\": \"${launch_method}\", \"suites\": [${test_suites}] }")
|
||||
else()
|
||||
message("${test_name} is of unknown type (TEST_LIBRARY property is empty)")
|
||||
ly_test_impact_extract_python_test_params(${test} "${test_params}" test_name test_suites)
|
||||
message("${test_name} is of unknown type (TEST_LIBRARY property is \"${test_type}\")")
|
||||
list(APPEND unknown_tests " { \"name\": \"${test}\", \"type\": \"${test_type}\" }")
|
||||
endif()
|
||||
endforeach()
|
||||
@@ -440,7 +438,7 @@ endfunction()
|
||||
|
||||
#! ly_test_impact_post_step: runs the post steps to be executed after all other cmake scripts have been executed.
|
||||
function(ly_test_impact_post_step)
|
||||
if(NOT ${LY_TEST_IMPACT_ACTIVE})
|
||||
if(NOT LY_TEST_IMPACT_INSTRUMENTATION_BIN)
|
||||
return()
|
||||
endif()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user