Global
/
googletest
mirror of https://github.com/google/googletest.git
1
0
Fork 0
Code Activity

Merge c06115ade0 into 283c17563f

This commit is contained in:
Virendra2406087 2026-09-04 11:06:02 +02:00 committed by GitHub
parent 283c17563f c06115ade0
commit f3c4726ca6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
googlemock/include/gmock/internal/gmock-internal-utils.h
View File

@ -266,6 +266,8 @@ const char kInfoVerbosity[] = "info";
const char kWarningVerbosity[] = "warning";
// No logs are printed.
const char kErrorVerbosity[] = "error";
// No logs are printed.
const char kIgnoreVerbosity[] = "ignore";
// Returns true if and only if a log with the given severity is visible
// according to the --gmock_verbose flag.

9
googlemock/src/gmock-internal-utils.cc
View File

@ -134,12 +134,13 @@ GTEST_API_ bool LogIsVisible(LogSeverity severity) {
if (GMOCK_FLAG_GET(verbose) == kInfoVerbosity) {
// Always show the log if --gmock_verbose=info.
return true;
} else if (GMOCK_FLAG_GET(verbose) == kErrorVerbosity) {
// Always hide it if --gmock_verbose=error.
} else if (GMOCK_FLAG_GET(verbose) == kErrorVerbosity ||
GMOCK_FLAG_GET(verbose) == kIgnoreVerbosity) {
// Always hide it if --gmock_verbose=error or --gmock_verbose=ignore.
return false;
} else {
// If --gmock_verbose is neither "info" nor "error", we treat it
// as "warning" (its default value).
// If --gmock_verbose is neither "info", "error", nor "ignore",
// we treat it as "warning" (its default value).
return severity == kWarning;
}
}

36
googletest/cmake/internal_utils.cmake
View File

@ -150,14 +150,40 @@ function(cxx_library_with_type name type cxx_flags)
set_target_properties(${name}
PROPERTIES
COMPILE_FLAGS "${cxx_flags}")
# Set the output directory for build artifacts.
set(runtime_output_dir "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
if(NOT runtime_output_dir)
set(runtime_output_dir "${CMAKE_BINARY_DIR}/bin")
endif()
set(library_output_dir "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
if(NOT library_output_dir)
set(library_output_dir "${CMAKE_BINARY_DIR}/lib")
endif()
set(archive_output_dir "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}")
if(NOT archive_output_dir)
set(archive_output_dir "${CMAKE_BINARY_DIR}/lib")
endif()
set(pdb_output_dir "${CMAKE_PDB_OUTPUT_DIRECTORY}")
if(NOT pdb_output_dir)
set(pdb_output_dir "${runtime_output_dir}")
endif()
set(compile_pdb_output_dir "${CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY}")
if(NOT compile_pdb_output_dir)
set(compile_pdb_output_dir "${archive_output_dir}")
endif()
set_target_properties(${name}
PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
RUNTIME_OUTPUT_DIRECTORY "${runtime_output_dir}"
LIBRARY_OUTPUT_DIRECTORY "${library_output_dir}"
ARCHIVE_OUTPUT_DIRECTORY "${archive_output_dir}"
PDB_OUTPUT_DIRECTORY "${pdb_output_dir}"
COMPILE_PDB_OUTPUT_DIRECTORY "${compile_pdb_output_dir}")
# Make PDBs match library name.
get_target_property(pdb_debug_postfix ${name} DEBUG_POSTFIX)
set_target_properties(${name}