[Cmake-commits] [cmake-commits] hoffman committed cmCacheManager.cxx 1.100.2.1 1.100.2.2 cmSystemTools.cxx 1.368.2.7 1.368.2.8

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Feb 10 17:28:10 EST 2009


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

Modified Files:
      Tag: CMake-2-6
	cmCacheManager.cxx cmSystemTools.cxx 
Log Message:
ENH: merge in some more fixes for RC 13


Index: cmCacheManager.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCacheManager.cxx,v
retrieving revision 1.100.2.1
retrieving revision 1.100.2.2
diff -C 2 -d -r1.100.2.1 -r1.100.2.2
*** cmCacheManager.cxx	3 Sep 2008 13:43:17 -0000	1.100.2.1
--- cmCacheManager.cxx	10 Feb 2009 22:28:08 -0000	1.100.2.2
***************
*** 785,789 ****
    if(type == FILEPATH || type == PATH)
      {
!     cmSystemTools::ConvertToUnixSlashes(e.Value);
      }
    if ( helpString )
--- 785,807 ----
    if(type == FILEPATH || type == PATH)
      {
!     if(e.Value.find(';') != e.Value.npos)
!       {
!       std::vector<std::string> paths;
!       cmSystemTools::ExpandListArgument(e.Value, paths);
!       const char* sep = "";
!       e.Value = "";
!       for(std::vector<std::string>::iterator i = paths.begin();
!           i != paths.end(); ++i)
!         {
!         cmSystemTools::ConvertToUnixSlashes(*i);
!         e.Value += sep;
!         e.Value += *i;
!         sep = ";";
!         }
!       }
!     else
!       {
!       cmSystemTools::ConvertToUnixSlashes(e.Value);
!       }
      }
    if ( helpString )

Index: cmSystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSystemTools.cxx,v
retrieving revision 1.368.2.7
retrieving revision 1.368.2.8
diff -C 2 -d -r1.368.2.7 -r1.368.2.8
*** cmSystemTools.cxx	24 Oct 2008 15:18:54 -0000	1.368.2.7
--- cmSystemTools.cxx	10 Feb 2009 22:28:08 -0000	1.368.2.8
***************
*** 2193,2196 ****
--- 2193,2204 ----
  void cmSystemTools::FindExecutableDirectory(const char* argv0)
  {
+ #if defined(_WIN32) && !defined(__CYGWIN__)
+   (void)argv0; // ignore this on windows
+   char modulepath[_MAX_PATH];
+   ::GetModuleFileName(NULL, modulepath, sizeof(modulepath));
+   cmSystemToolsExecutableDirectory =
+     cmSystemTools::GetFilenamePath(modulepath);
+   return;
+ #else
    std::string errorMsg;
    std::string exe;
***************
*** 2206,2209 ****
--- 2214,2218 ----
      // ???
      }
+ #endif
  }
  



More information about the Cmake-commits mailing list