[Cmake-commits] [cmake-commits] hoffman committed SystemTools.cxx 1.222.2.1 1.222.2.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	SystemTools.cxx 
Log Message:
ENH: merge in changes from main tree, fortran mod stuff


Index: SystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemTools.cxx,v
retrieving revision 1.222.2.1
retrieving revision 1.222.2.2
diff -C 2 -d -r1.222.2.1 -r1.222.2.2
*** SystemTools.cxx	30 Mar 2008 13:09:49 -0000	1.222.2.1
--- SystemTools.cxx	24 Apr 2008 18:57:36 -0000	1.222.2.2
***************
*** 79,83 ****
  
  #define VTK_URL_PROTOCOL_REGEX "([a-zA-Z0-9]*)://(.*)"
! #define VTK_URL_REGEX "([a-zA-Z0-9]*)://(([A-Za-z]+)(:([^:@]+))?@)?([^:@/]+)(:([0-9]+))?/(.+)?"
  
  #ifdef _MSC_VER
--- 79,83 ----
  
  #define VTK_URL_PROTOCOL_REGEX "([a-zA-Z0-9]*)://(.*)"
! #define VTK_URL_REGEX "([a-zA-Z0-9]*)://(([A-Za-z0-9]+)(:([^:@]+))?@)?([^:@/]+)(:([0-9]+))?/(.+)?"
  
  #ifdef _MSC_VER