ENH: move to RC 10

3 files changed, 13 insertions, 1 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59509e4f05..af11eb7e73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ SET(CMake_VERSION_MAJOR 2)
 SET(CMake_VERSION_MINOR 4)
 SET(CMake_VERSION_PATCH 7)
 # for an actual release this should not be defined
-SET(CMake_VERSION_RC 9)
+SET(CMake_VERSION_RC 10)
 SET(CMake_VERSION "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
 SET(CMake_VERSION_FULL "${CMake_VERSION}.${CMake_VERSION_PATCH}")
 
diff --git a/ChangeLog.manual b/ChangeLog.manual
index 5a2964ec09..5f17004810 100644
--- a/ChangeLog.manual
+++ b/ChangeLog.manual
@@ -1,4 +1,6 @@
 Changes in CMake 2.4.7
+--- RC 10 ----
+* Fix rebuild problem with makefiles and cmake vs CMakeSetup 
 --- RC 9 ---
 * Fix problem with \@ in configure files bug# 5130 
 --- RC 8 ---
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx
index c16be78e52..c32a5d1ecc 100644
--- a/Source/kwsys/SystemTools.cxx
+++ b/Source/kwsys/SystemTools.cxx
@@ -125,6 +125,11 @@ inline const char* Getcwd(char* buf, unsigned int len)
     fprintf(stderr, "No current working directory.\n");
     abort();
     }
+  // make sure the drive letter is capital
+  if(strlen(buf) > 1 && buf[1] == ':')
+    {
+    buf[0] = toupper(buf[0]);
+    }
   return ret;
 }
 inline int Chdir(const char* dir)
@@ -2842,6 +2847,11 @@ kwsys_stl::string SystemTools::GetActualCaseForPath(const char* p)
     {
     return p;
     }
+  // make sure drive letter is always upper case
+  if(longPath.size() > 1 && longPath[1] == ':')
+    {
+    longPath[0] = toupper(longPath[0]);
+    }
   return longPath;
 #endif  
 }