organicmaps/gflags
13
Fork 0
mirror of https://github.com/gflags/gflags.git synced 2025-04-05 05:25:04 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge 40e90a1a4f into a738fdf933

Browse source
This commit is contained in:
denniszollo 2023-06-05 22:57:55 +01:00 • committed by GitHub
commit 57a33893ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -149,6 +149,13 @@ file (TO_CMAKE_PATH "${CMAKE_INSTALL_PREFIX}" CMAKE_INSTALL_PREFIX)
# ----------------------------------------------------------------------------
# options
OPTION(GFLAGS_STRIP_INTERNAL_FLAG_HELP "Hide help from GFLAGS modules" OFF)
IF(GFLAGS_STRIP_INTERNAL_FLAG_HELP)
SET(STRIP_INTERNAL_FLAG_HELP 1)
ELSE(GFLAGS_STRIP_INTERNAL_FLAG_HELP)
SET(STRIP_INTERNAL_FLAG_HELP 0)
ENDIF(GFLAGS_STRIP_INTERNAL_FLAG_HELP)
# maintain binary backwards compatibility with gflags library version <= 2.0,
# but at the same time enable the use of the preferred new "gflags" namespace
gflags_define (STRING NAMESPACE "Name(s) of library namespace (separate multiple options by semicolon)" "google;${PACKAGE_NAME}" "${PACKAGE_NAME}")

1
src/defines.h.in
View file

@ -44,5 +44,6 @@
// Define if your pthread library defines the type pthread_rwlock_t
#cmakedefine HAVE_RWLOCK
#cmakedefine STRIP_INTERNAL_FLAG_HELP
#endif // GFLAGS_DEFINES_H_

5
src/gflags.cc
View file

@ -88,6 +88,11 @@
// are, similarly, mostly hooks into the functionality described above.
#include "config.h"
#ifdef STRIP_INTERNAL_FLAG_HELP
# define STRIP_FLAG_HELP 1
#endif
#include "gflags/gflags.h"
#include <cassert>

5
src/gflags_completions.cc
View file

@ -56,6 +56,11 @@
#include <vector>
#include "config.h"
#ifdef STRIP_INTERNAL_FLAG_HELP
# define STRIP_FLAG_HELP 1
#endif
#include "gflags/gflags.h"
#include "gflags/gflags_completions.h"
#include "util.h"

12
src/gflags_reporting.cc
View file

@ -56,6 +56,11 @@
#include <vector>
#include "config.h"
#ifdef STRIP_INTERNAL_FLAG_HELP
# define STRIP_FLAG_HELP 1
#endif
#include "gflags/gflags.h"
#include "gflags/gflags_completions.h"
#include "util.h"
@ -118,7 +123,7 @@ static string PrintStringFlagsWithQuotes(const CommandLineFlagInfo& flag,
// Goes to some trouble to make pretty line breaks.
string DescribeOneFlag(const CommandLineFlagInfo& flag) {
string main_part;
SStringPrintf(&main_part, " -%s (%s)",
SStringPrintf(&main_part, " --%s (%s)",
flag.name.c_str(),
flag.description.c_str());
const char* c_string = main_part.c_str();
@ -284,7 +289,9 @@ static void ShowUsageWithFlagsMatching(const char *argv0,
fprintf(stdout, "\n\n"); // put blank lines between directories
first_directory = false;
}
#ifndef STRIP_INTERNAL_FLAG_HELP
fprintf(stdout, "\n Flags from %s:\n", flag->filename.c_str());
#endif // STRIP_INTERNAL_FLAG_HELP
last_filename = flag->filename;
}
// Now print this flag
@ -346,9 +353,6 @@ static void ShowVersion() {
} else {
fprintf(stdout, "%s\n", ProgramInvocationShortName());
}
# if !defined(NDEBUG)
fprintf(stdout, "Debug build (NDEBUG not #defined)\n");
# endif
}
static void AppendPrognameStrings(vector<string>* substrings,