kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: add rc to version stuff

Browse Source
This commit is contained in:
Bill Hoffman 2006-11-28 16:09:21 -05:00
parent 07fe0176d2
commit e9a80cd8a9
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmConfigure.cmake.h.in
View File

@ -11,5 +11,5 @@
#define CMake_VERSION_MAJOR @CMake_VERSION_MAJOR@ #define CMake_VERSION_MAJOR @CMake_VERSION_MAJOR@
#define CMake_VERSION_MINOR @CMake_VERSION_MINOR@ #define CMake_VERSION_MINOR @CMake_VERSION_MINOR@
#define CMake_VERSION_PATCH @CMake_VERSION_PATCH@ #define CMake_VERSION_PATCH @CMake_VERSION_PATCH@
#cmakedefine CMake_VERSION_RC @CMake_VERSION_RC@
#define CMAKE_DATA_DIR "@CMAKE_DATA_DIR@" #define CMAKE_DATA_DIR "@CMAKE_DATA_DIR@"

9
Source/cmMakefile.cxx
View File

@ -138,12 +138,17 @@ const char* cmMakefile::GetReleaseVersion()
#if CMake_VERSION_MINOR & 1 #if CMake_VERSION_MINOR & 1
return "development"; return "development";
#else #else
# if CMake_VERSION_PATCH == 0 # if CMake_VERSION_PATCH == 1
return "beta"; return "1-beta";
# else
# ifdef CMake_VERSION_RC
return "patch " CMAKE_TO_STRING(CMake_VERSION_PATCH) " RC-"
CMAKE_TO_STRING(CMake_VERSION_RC);
# else # else
return "patch " CMAKE_TO_STRING(CMake_VERSION_PATCH); return "patch " CMAKE_TO_STRING(CMake_VERSION_PATCH);
# endif # endif
# endif # endif
#endif
} }
unsigned int cmMakefile::GetCacheMajorVersion() unsigned int cmMakefile::GetCacheMajorVersion()

9
Source/cmVersion.cxx
View File

@ -56,12 +56,17 @@ std::string cmVersion::GetReleaseVersion()
} }
return res; return res;
#else #else
# if CMake_VERSION_PATCH == 0 # if CMake_VERSION_PATCH == 1
return "beta"; return "1-beta";
# else
# ifdef CMake_VERSION_RC
return "patch " CMAKE_TO_STRING(CMake_VERSION_PATCH) " RC-"
CMAKE_TO_STRING(CMake_VERSION_RC);
# else # else
return "patch " CMAKE_TO_STRING(CMake_VERSION_PATCH); return "patch " CMAKE_TO_STRING(CMake_VERSION_PATCH);
# endif # endif
# endif # endif
#endif
} }
std::string cmVersion::GetCMakeVersion() std::string cmVersion::GetCMakeVersion()