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
Code/Framework/AzCore/CMakeLists.txt
+1 -1
View File
@@ -12,7 +12,7 @@
ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
ly_get_list_relative_pal_filename(common_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/Common)
if(LY_ENABLE_RAD_TELEMETRY)
if(LY_RAD_TELEMETRY_ENABLED)
set(AZ_CORE_RADTELEMETRY_FILES ${common_dir}/azcore_profile_telemetry_files.cmake)
set(AZ_CORE_RADTELEMETRY_PLATFORM_INCLUDES ${pal_dir}/profile_telemetry_platform_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
set(AZ_CORE_RADTELEMETRY_INCLUDE_DIRECTORIES ${common_dir})
Code/Framework/AzCore/Platform/Android/profile_telemetry_platform_android.cmake
+1 -1
View File
@@ -12,6 +12,6 @@
# is being avoided to prevent overriding functions declared in other targets platfrom
# specific cmake files
if(LY_ENABLE_RAD_TELEMETRY)
if(LY_RAD_TELEMETRY_ENABLED)
set(LY_COMPILE_DEFINITIONS PUBLIC AZ_PROFILE_TELEMETRY)
endif()
Code/Framework/AzCore/Platform/Mac/profile_telemetry_platform_mac.cmake
+1 -1
View File
@@ -12,6 +12,6 @@
# is being avoided to prevent overriding functions declared in other targets platfrom
# specific cmake files
if(LY_ENABLE_RAD_TELEMETRY)
if(LY_RAD_TELEMETRY_ENABLED)
set(LY_COMPILE_DEFINITIONS PUBLIC AZ_PROFILE_TELEMETRY)
endif()
Code/Framework/AzCore/Platform/Windows/profile_telemetry_platform_windows.cmake
+1 -1
View File
@@ -12,6 +12,6 @@
# is being avoided to prevent overriding functions declared in other targets platfrom
# specific cmake files
if(LY_ENABLE_RAD_TELEMETRY)
if(LY_RAD_TELEMETRY_ENABLED)
set(LY_COMPILE_DEFINITIONS PUBLIC AZ_PROFILE_TELEMETRY)
endif()
Code/Framework/AzCore/Platform/iOS/profile_telemetry_platform_ios.cmake
+1 -1
View File
@@ -6,6 +6,6 @@
#
#
if(LY_ENABLE_RAD_TELEMETRY)
if(LY_RAD_TELEMETRY_ENABLED)
set(LY_COMPILE_DEFINITIONS PUBLIC AZ_PROFILE_TELEMETRY)
endif()
Code/Framework/AzFramework/CMakeLists.txt
+2 -2
View File
@@ -10,7 +10,7 @@
ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
ly_get_list_relative_pal_filename(common_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/Common)
set(LY_ENABLE_STATISTICAL_PROFILING OFF CACHE BOOL "Enables statistical profiling when using AZ_PROFILE_SCOPE. If True, it takes effect only if RAD Telemetry is disabled.")
set(LY_STATISTICAL_PROFILING_ENABLED OFF CACHE BOOL "Enables statistical profiling when using AZ_PROFILE_SCOPE. If True, it takes effect only if RAD Telemetry is disabled.")
set(LY_TOUCHBENDING_LAYER_BIT 63 CACHE STRING "Use TouchBending as the collision layer. The TouchBending layer can be a number from 1 to 63 (Default=63).")
ly_add_target(
@@ -38,7 +38,7 @@ ly_add_target(
3rdParty::lz4
)
if(LY_ENABLE_STATISTICAL_PROFILING)
if(LY_STATISTICAL_PROFILING_ENABLED)
ly_add_source_properties(
SOURCES AzFramework/Debug/StatisticalProfilerProxy.h
PROPERTY COMPILE_DEFINITIONS
Code/Tools/TestImpactFramework/CMakeLists.txt
+5 -3
View File
@@ -10,7 +10,9 @@ ly_get_list_relative_pal_filename(pal_source_dir ${CMAKE_CURRENT_LIST_DIR}/Platf
include(${pal_source_dir}/PAL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
if(${LY_TEST_IMPACT_ACTIVE} AND PAL_TRAIT_TEST_IMPACT_FRAMEWORK_SUPPORTED)
add_subdirectory(Runtime)
add_subdirectory(Frontend)
if(PAL_TRAIT_TEST_IMPACT_FRAMEWORK_SUPPORTED)
if(LY_TEST_IMPACT_INSTRUMENTATION_BIN)
add_subdirectory(Runtime)
add_subdirectory(Frontend)
endif()
endif()
Gems/AudioEngineWwise/Code/CMakeLists.txt
-3
View File
@@ -16,9 +16,6 @@ set(AUDIOENGINEWWISE_COMPILEDEFINITIONS
)
find_package(Wwise MODULE)
if (NOT Wwise_FOUND)
message(STATUS "** Update the LY_WWISE_INSTALL_PATH cache variable if you intend to use Wwise.")
endif()
################################################################################
# Server / Unsupported
Gems/MultiplayerCompression/Code/CMakeLists.txt
-2
View File
@@ -6,8 +6,6 @@
#
#
set(LY_ENABLE_MULTIPLAYER_COMPRESSION OFF CACHE BOOL "Enables usage of Multiplayer Compressor.")
ly_add_target(
NAME MultiplayerCompression.Static STATIC
NAMESPACE Gem
Gems/RADTelemetry/Code/CMakeLists.txt
+3 -2
View File
@@ -6,8 +6,9 @@
#
#
set(LY_ENABLE_RAD_TELEMETRY OFF CACHE BOOL "Enables RAD Telemetry in Debug/Profile mode.")
set(LY_RAD_TELEMETRY_INSTALL_ROOT "${LY_3RDPARTY_PATH}/RadTelemetry" CACHE PATH "Install path to RAD Telemetry.")
set(LY_RAD_TELEMETRY_ENABLED OFF CACHE BOOL "Enables RAD Telemetry in Debug/Profile mode.")
set(LY_RAD_TELEMETRY_INSTALL_ROOT "@LY_3RDPARTY_PATH@/RadTelemetry" CACHE PATH "Install path to RAD Telemetry.")
string(CONFIGURE ${LY_RAD_TELEMETRY_INSTALL_ROOT} LY_RAD_TELEMETRY_INSTALL_ROOT @ONLY)
ly_get_list_relative_pal_filename(pal_source_dir ${CMAKE_CURRENT_LIST_DIR}/Source/Platform/${PAL_PLATFORM_NAME})
cmake/3rdParty/FindWwise.cmake
Vendored
+2 -4
View File
@@ -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
cmake/Deployment.cmake
+1 -1
View File
@@ -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.")
cmake/EngineJson.cmake
+2 -1
View File
@@ -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
cmake/FileUtil.cmake
+1 -1
View 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()
cmake/O3DEJson.cmake
-2
View File
@@ -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
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
cmake/TestImpactFramework/LYTestImpactFramework.cmake
+6 -8
View File
@@ -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()
scripts/build/Platform/Windows/build_config.json
+2 -2
View File
@@ -132,7 +132,7 @@
"PARAMETERS": {
"CONFIGURATION": "profile",
"OUTPUT_DIRECTORY": "build\\windows_vs2019",
"CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DLY_TEST_IMPACT_ACTIVE=1 -DLY_TEST_IMPACT_INSTRUMENTATION_BIN=!TEST_IMPACT_WIN_BINARY!",
"CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DLY_TEST_IMPACT_INSTRUMENTATION_BIN=!TEST_IMPACT_WIN_BINARY!",
"CMAKE_LY_PROJECTS": "AutomatedTesting",
"CMAKE_TARGET": "ALL_BUILD",
"CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
@@ -328,7 +328,7 @@
"PARAMETERS": {
"CONFIGURATION": "profile",
"OUTPUT_DIRECTORY": "build\\windows_vs2019",
"CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DLY_DISABLE_TEST_MODULES=TRUE -DLY_VERSION_ENGINE_NAME=o3de-sdk -DCPACK_WIX_ROOT=\"!WIX! \"",
"CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DLY_DISABLE_TEST_MODULES=TRUE -DLY_VERSION_ENGINE_NAME=o3de-sdk -DLY_INSTALLER_WIX_ROOT=\"!WIX! \"",
"EXTRA_CMAKE_OPTIONS": "-DLY_INSTALLER_AUTO_GEN_TAG=ON -DLY_INSTALLER_DOWNLOAD_URL=https://dkb1uj4hs9ikv.cloudfront.net -DLY_INSTALLER_LICENSE_URL=https://www.o3debinaries.org/license -DLY_INSTALLER_3RD_PARTY_LICENSE_URL=https://dkb1uj4hs9ikv.cloudfront.net/SPDX-Licenses.txt",
"CPACK_BUCKET": "spectra-prism-staging-us-west-2",
"CMAKE_LY_PROJECTS": "",
scripts/ctest/CMakeLists.txt
+1
View File
@@ -42,5 +42,6 @@ ly_add_test(
TEST_COMMAND ${LY_PYTHON_CMD} ${CMAKE_CURRENT_LIST_DIR}/ctest_driver_test.py
-x ${CMAKE_CTEST_COMMAND}
--build-path ${CMAKE_BINARY_DIR}
TEST_LIBRARY pytest
)