[cmake-commits] hoffman committed cmConfigure.cmake.h.in 1.9 1.10 cmVersion.cxx 1.711 1.712 cmMakefile.cxx 1.363 1.364

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv24874/Source

Modified Files:
	cmConfigure.cmake.h.in cmVersion.cxx cmMakefile.cxx 
Log Message:
ENH: add rc to version stuff


Index: cmVersion.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmVersion.cxx,v
retrieving revision 1.711
retrieving revision 1.712
diff -u -d -r1.711 -r1.712
--- cmVersion.cxx	28 Nov 2006 05:05:44 -0000	1.711
+++ cmVersion.cxx	28 Nov 2006 21:09:21 -0000	1.712
@@ -56,10 +56,15 @@
     }
   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
 }

Index: cmConfigure.cmake.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmConfigure.cmake.h.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cmConfigure.cmake.h.in	17 Mar 2006 21:30:47 -0000	1.9
+++ cmConfigure.cmake.h.in	28 Nov 2006 21:09:21 -0000	1.10
@@ -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@"

Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -d -r1.363 -r1.364
--- cmMakefile.cxx	20 Nov 2006 18:57:12 -0000	1.363
+++ cmMakefile.cxx	28 Nov 2006 21:09:21 -0000	1.364
@@ -138,11 +138,16 @@
 #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
 }