Set C4VERSION macros from CMake assembled vars

There's no reason to have CMake assemble a version string, then have a
similar (but slightly different) string built by the C preprocessor.
Since CMake already has the values we want, just dump those into the
macros.
stable-6.1
Nicolas Hake 2015-05-21 21:59:49 +02:00
parent 0c5e0c131a
commit 88ee2f7db8
1 changed files with 3 additions and 14 deletions

View File

@ -32,8 +32,6 @@
#define C4XVER1 @C4XVER1@ #define C4XVER1 @C4XVER1@
#define C4XVER2 @C4XVER2@ #define C4XVER2 @C4XVER2@
#define C4VERSIONBUILDNAME "@C4VERSIONBUILDNAME@"
#define C4VERSIONEXTRA "@C4VERSIONEXTRA@"
#define C4REVISION "@C4REVISION@" #define C4REVISION "@C4REVISION@"
// Build Options // Build Options
@ -44,19 +42,10 @@
#endif #endif
#define C4BUILDOPT C4BUILDDEBUG #define C4BUILDOPT C4BUILDDEBUG
// These need to be one string because MSVC doesn't like L"a" "b" #define C4ENGINEINFOLONG "@C4ENGINEINFO@"
#define C4ENGINEINFOLONG "@C4ENGINENAME@@C4VERSIONBUILDNAME@@C4VERSIONEXTRA@" #define C4ENGINECAPTION "@C4ENGINECAPTION@"
#define C4ENGINECAPTION "@C4ENGINENAME@@C4VERSIONBUILDNAME@"
#define C4XVERTOC4XVERS(s) C4XVERTOC4XVERS2(s) #define C4VERSION "@C4VERSION@" C4BUILDOPT
#define C4XVERTOC4XVERS2(s) #s
// if C4XVER2 >= 90, this is a pre-release version; add VCS revision
#if C4XVER2 >= 90
#define C4VERSION C4XVERTOC4XVERS(C4XVER1) "." C4XVERTOC4XVERS(C4XVER2) " [" C4REVISION "]" C4VERSIONEXTRA C4BUILDOPT
#else
#define C4VERSION C4XVERTOC4XVERS(C4XVER1) "." C4XVERTOC4XVERS(C4XVER2) C4VERSIONEXTRA C4BUILDOPT
#endif
// if this is set, add a build identifier to the logs and crash dumps // if this is set, add a build identifier to the logs and crash dumps
#define OC_BUILD_ID "@OC_BUILD_ID@" #define OC_BUILD_ID "@OC_BUILD_ID@"