[cmake-commits] hoffman committed cmConfigure.cmake.h.in 1.9 1.9.2.1 cmMakefile.cxx 1.335.2.10 1.335.2.11 cmVersion.cxx 1.517.2.1 1.517.2.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-4
	cmConfigure.cmake.h.in cmMakefile.cxx cmVersion.cxx 
Log Message:
ENH: add release candidate to versions


Index: cmVersion.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmVersion.cxx,v
retrieving revision 1.517.2.1
retrieving revision 1.517.2.2
diff -u -d -r1.517.2.1 -r1.517.2.2
--- cmVersion.cxx	29 Apr 2006 15:49:20 -0000	1.517.2.1
+++ cmVersion.cxx	28 Nov 2006 21:03:52 -0000	1.517.2.2
@@ -59,7 +59,12 @@
 # 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.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- cmConfigure.cmake.h.in	17 Mar 2006 21:30:47 -0000	1.9
+++ cmConfigure.cmake.h.in	28 Nov 2006 21:03:51 -0000	1.9.2.1
@@ -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.335.2.10
retrieving revision 1.335.2.11
diff -u -d -r1.335.2.10 -r1.335.2.11
--- cmMakefile.cxx	20 Nov 2006 19:23:45 -0000	1.335.2.10
+++ cmMakefile.cxx	28 Nov 2006 21:03:51 -0000	1.335.2.11
@@ -141,7 +141,12 @@
 # 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
 }