diff options
| author | Naios <naios-dev@live.de> | 2016-02-21 15:52:42 +0100 |
|---|---|---|
| committer | Naios <naios-dev@live.de> | 2016-02-21 15:52:42 +0100 |
| commit | 719159e2074ac2d0902c70bdd3c7a39e0d311bbe (patch) | |
| tree | 11f772b81ffef8e238cd5f91110fb1edc5f384cc /revision_data.h.in.cmake | |
| parent | 5534915f743c707c07cb977bca67c2ff15487597 (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
Diffstat (limited to 'revision_data.h.in.cmake')
| -rw-r--r-- | revision_data.h.in.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/revision_data.h.in.cmake b/revision_data.h.in.cmake index a4b749f0c0d..cf00e06d02f 100644 --- a/revision_data.h.in.cmake +++ b/revision_data.h.in.cmake @@ -3,7 +3,9 @@ #define _HASH "@rev_hash@" #define _DATE "@rev_date@" #define _BRANCH "@rev_branch@" + #define _CMAKE_COMMAND "@CMAKE_COMMAND@" #define _SOURCE_DIRECTORY "@CMAKE_SOURCE_DIR@" + #define _BUILD_DIRECTORY "@BUILDDIR@" #define _MYSQL_EXECUTABLE "@MYSQL_EXECUTABLE@" #define _FULL_DATABASE "TDB_full_world_6.03_2015_11_08.sql" #define _HOTFIXES_DATABASE "TDB_full_hotfixes_6.03_2015_11_08.sql" @@ -13,6 +15,4 @@ #define VER_FILEVERSION_STR "@rev_hash@ @rev_date@ (@rev_branch@ branch)" #define VER_PRODUCTVERSION VER_FILEVERSION #define VER_PRODUCTVERSION_STR VER_FILEVERSION_STR - #define COMPILER_C_FLAGS "@CMAKE_C_FLAGS@" - #define COMPILER_CXX_FLAGS "@CMAKE_CXX_FLAGS@" #endif // __REVISION_DATA_H__ |