Browse Source

ENH: add rc to version stuff

Bill Hoffman 19 years ago
parent
commit
e9a80cd8a9
3 changed files with 15 additions and 5 deletions
  1. 1 1
      Source/cmConfigure.cmake.h.in
  2. 7 2
      Source/cmMakefile.cxx
  3. 7 2
      Source/cmVersion.cxx

+ 1 - 1
Source/cmConfigure.cmake.h.in

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

+ 7 - 2
Source/cmMakefile.cxx

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

+ 7 - 2
Source/cmVersion.cxx

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