diff --git a/CMakeLists.txt b/CMakeLists.txt index bd2a7a1ea..04053f257 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,7 +109,7 @@ option_if_not_defined(GPGMM_ENABLE_ALLOCATOR_LEAK_CHECKS "Enables checking of al option_if_not_defined(GPGMM_ENABLE_ASSERT_ON_WARNING "Enables ASSERT on severity functionality" OFF) option_if_not_defined(GPGMM_DISABLE_SIZE_CACHE "Enables warming of caches with common resource sizes" OFF) option_if_not_defined(GPGMM_ENABLE_MEMORY_ALIGN_CHECKS "Enables checking of resource alignment." OFF) -option_if_not_defined(GPGMM_ENABLE_LOGGING_INTERNAL_OBJECTS "Enables log messages for internal objects." OFF) +option_if_not_defined(GPGMM_ENABLE_LOGGING_INTERNAL "Enables log messages for internal objects." OFF) if(GPGMM_ENABLE_TESTS) # Vulkan tests require static linking. diff --git a/build_overrides/gpgmm_features.gni b/build_overrides/gpgmm_features.gni index 5a8ec82fd..a1064ba3d 100644 --- a/build_overrides/gpgmm_features.gni +++ b/build_overrides/gpgmm_features.gni @@ -68,6 +68,6 @@ declare_args() { gpgmm_vk_dynamic_functions = false # Enables log messages for internal objects. - # Sets -dGPGMM_ENABLE_LOGGING_INTERNAL_OBJECTS - gpgmm_enable_logging_internal_objects = false + # Sets -dGPGMM_ENABLE_LOGGING_INTERNAL + gpgmm_enable_logging_internal = false } diff --git a/src/gpgmm/common/BUILD.gn b/src/gpgmm/common/BUILD.gn index 52bca103d..4f893c379 100644 --- a/src/gpgmm/common/BUILD.gn +++ b/src/gpgmm/common/BUILD.gn @@ -79,8 +79,8 @@ config("gpgmm_common_config") { defines += [ "GPGMM_ENABLE_MEMORY_ALIGN_CHECKS" ] } - if (gpgmm_enable_logging_internal_objects) { - defines += [ "GPGMM_ENABLE_LOGGING_INTERNAL_OBJECTS" ] + if (gpgmm_enable_logging_internal) { + defines += [ "GPGMM_ENABLE_LOGGING_INTERNAL" ] } # Only internal build targets can use this config, this means only targets in diff --git a/src/gpgmm/utils/Log.cpp b/src/gpgmm/utils/Log.cpp index 836b9ed28..bfa6c8130 100644 --- a/src/gpgmm/utils/Log.cpp +++ b/src/gpgmm/utils/Log.cpp @@ -116,7 +116,7 @@ namespace gpgmm { } // Ignore internal objects being logged unless the build is enabled for it. -#if !defined(GPGMM_ENABLE_LOGGING_INTERNAL_OBJECTS) +#if !defined(GPGMM_ENABLE_LOGGING_INTERNAL) if (!mIsExternal) { return; }