diff options
author | Naios <naios-dev@live.de> | 2016-02-22 16:25:47 +0100 |
---|---|---|
committer | Naios <naios-dev@live.de> | 2016-02-22 16:25:47 +0100 |
commit | b5369b7d874c337f49051f79dba9508f21a218de (patch) | |
tree | a71b3978b6df3769cc654b81f7f70ec1835077a2 /src/common/GitRevision.h | |
parent | f2233f5d1426d12d16178eced900c1be9666983f (diff) |
Core/Common: Add a generic config helper to access built-in overwriteable paths.
* Adds CMAKE_COMMAND and CMAKE_BINARY_DIR to revision_data.h
* Move the source and mysql exe path handling out of the DBUpdater.
* Make some Config methods const for correctness.
* Remove C & CXX flags from revision_data.h
(was unused and didn't capture all cxx vars)
* Reorder the link order to prevent `ld` from ignoring the file
* Ref #15671
(cherry picked from commit 719159e2074ac2d0902c70bdd3c7a39e0d311bbe)
Diffstat (limited to 'src/common/GitRevision.h')
-rw-r--r-- | src/common/GitRevision.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/GitRevision.h b/src/common/GitRevision.h index 8d2764ba861..7fddcb7605a 100644 --- a/src/common/GitRevision.h +++ b/src/common/GitRevision.h @@ -25,6 +25,8 @@ namespace GitRevision char const* GetHash(); char const* GetDate(); char const* GetBranch(); + char const* GetCMakeCommand(); + char const* GetBuildDirectory(); char const* GetSourceDirectory(); char const* GetMySQLExecutable(); char const* GetFullDatabase(); @@ -33,8 +35,6 @@ namespace GitRevision char const* GetLegalCopyrightStr(); char const* GetFileVersionStr(); char const* GetProductVersionStr(); - char const* GetCompilerCFlags(); - char const* GetCompilerCXXFlags(); } #endif |