Making trait variable consistent and fixing warning (#5118)

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

Gems/PhysX/Code/CMakeLists.txt

@@ -11,7 +11,7 @@ add_subdirectory(NumericalMethods)
 ly_get_list_relative_pal_filename(pal_source_dir ${CMAKE_CURRENT_LIST_DIR}/Source/Platform/${PAL_PLATFORM_NAME})
 
 include(${pal_source_dir}/PAL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake) # for PAL_TRAIT_PHYSX_SUPPORTED
-set(PHYSX_ENABLE_RUNNING_BENCHMARKS OFF CACHE BOOL "Adds a target to allow running of the physx benchmarks.")
+set(LY_PHYSX_ENABLE_RUNNING_BENCHMARKS OFF CACHE BOOL "Adds a target to allow running of the physx benchmarks.")
 
 if(PAL_TRAIT_PHYSX_SUPPORTED)
     set(physx_dependency 3rdParty::PhysX)
@@ -197,7 +197,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
     # Only add the physx benchmarks if this flag is set. The benchmark code is still built, as it is part of the PhysX.Tests project.
     # Currently jenkins has a 1500sec(25min) timeout, our benchmarks can sometimes take over 1500sec and cause a build failure for timeout.
     # Jenkins currently doesn't upload the results of the benchmarks, so this is ok.
-    if(PHYSX_ENABLE_RUNNING_BENCHMARKS)
+    if(LY_PHYSX_ENABLE_RUNNING_BENCHMARKS)
         ly_add_googlebenchmark(
             NAME Gem::PhysX.Benchmarks
             TARGET Gem::PhysX.Tests

Gems/PhysX/Code/Source/Utils.cpp

@@ -102,7 +102,7 @@ namespace PhysX
             const float scaleFactor = (maxHeightBounds <= minHeightBounds) ? 1.0f : AZStd::numeric_limits<int16_t>::max() / halfBounds;
             const float heightScale{ 1.0f / scaleFactor };
 
-            [[maybe_unused]] const uint8_t physxMaximumMaterialIndex = 0x7f;
+            [[maybe_unused]] constexpr uint8_t physxMaximumMaterialIndex = 0x7f;
 
             // Delete the cached heightfield object if it is there, and create a new one and save in the shape configuration
             heightfieldConfig.SetCachedNativeHeightfield(nullptr);