Index: Modules/CMakeDetermineRCCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineRCCompiler.cmake,v
retrieving revision 1.8
diff -u -r1.8 CMakeDetermineRCCompiler.cmake
--- Modules/CMakeDetermineRCCompiler.cmake	31 Aug 2006 14:46:02 -0000	1.8
+++ Modules/CMakeDetermineRCCompiler.cmake	24 Jun 2008 12:48:05 -0000
@@ -29,7 +29,7 @@
   IF(CMAKE_RC_COMPILER_INIT)
     SET(CMAKE_RC_COMPILER_LIST ${CMAKE_RC_COMPILER_INIT})
   ELSE(CMAKE_RC_COMPILER_INIT)
-    SET(CMAKE_RC_COMPILER_LIST rc)
+    SET(CMAKE_RC_COMPILER_LIST rc windres)
   ENDIF(CMAKE_RC_COMPILER_INIT)
 
   # Find the compiler.
Index: Modules/Platform/Windows-cl.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-cl.cmake,v
retrieving revision 1.86
diff -u -r1.86 Windows-cl.cmake
--- Modules/Platform/Windows-cl.cmake	23 Jun 2008 17:37:58 -0000	1.86
+++ Modules/Platform/Windows-cl.cmake	24 Jun 2008 12:48:06 -0000
@@ -27,14 +27,6 @@
   SET(CMAKE_COMPILER_2005 1)
 ENDIF(CMAKE_GENERATOR MATCHES  "Visual Studio 9")
 
-
-# make sure to enable languages after setting configuration types
-ENABLE_LANGUAGE(RC OPTIONAL)
-IF(NOT CMAKE_RC_COMPILER_WORKS )
-  MESSAGE(STATUS "Warning: RC not found, this build will not be able to compile resource files.")
-ENDIF(NOT CMAKE_RC_COMPILER_WORKS )
-SET(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>")
-
 # for nmake we need to compute some information about the compiler 
 # that is being used.
 # the compiler may be free command line, 6, 7, or 71, and
Index: Modules/Platform/Windows-df.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-df.cmake,v
retrieving revision 1.1
diff -u -r1.1 Windows-df.cmake
--- Modules/Platform/Windows-df.cmake	20 Feb 2007 21:43:32 -0000	1.1
+++ Modules/Platform/Windows-df.cmake	24 Jun 2008 12:48:06 -0000
@@ -22,7 +22,7 @@
 SET(CMAKE_Fortran_COMPILE_OBJECT
     "<CMAKE_Fortran_COMPILER>  ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO} /object:<OBJECT> <FLAGS> /compile_only <SOURCE>${CMAKE_END_TEMP_FILE}")
 
-SET(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>")
+SET(CMAKE_COMPILE_RC_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> /fo<OBJECT> <SOURCE>")
 
 SET(CMAKE_Fortran_LINK_EXECUTABLE
     "<CMAKE_Fortran_COMPILER> ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} <FLAGS> <OBJECTS> /exe:<TARGET> /link <CMAKE_Fortran_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
Index: Modules/Platform/Windows-gcc.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-gcc.cmake,v
retrieving revision 1.20
diff -u -r1.20 Windows-gcc.cmake
--- Modules/Platform/Windows-gcc.cmake	30 Jan 2008 01:46:25 -0000	1.20
+++ Modules/Platform/Windows-gcc.cmake	24 Jun 2008 12:48:06 -0000
@@ -19,6 +19,7 @@
 SET(CMAKE_LINK_LIBRARY_FLAG "-l")
 SET(CMAKE_EXTRA_LINK_EXTENSIONS ".lib") # MinGW can also link to a MS .lib
 SET(CMAKE_CREATE_WIN32_EXE  "-mwindows")
+SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> --input-format rc --output-format coff <FLAGS> -i<SOURCE> -o<OBJECT>")
 
 IF(MINGW)
   SET(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
Index: Modules/Platform/Windows-icl.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-icl.cmake,v
retrieving revision 1.4
diff -u -r1.4 Windows-icl.cmake
--- Modules/Platform/Windows-icl.cmake	14 Jan 2008 14:20:57 -0000	1.4
+++ Modules/Platform/Windows-icl.cmake	24 Jun 2008 12:48:06 -0000
@@ -37,7 +37,7 @@
 SET(CMAKE_C_LINK_EXECUTABLE
     "<CMAKE_C_COMPILER> ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} <FLAGS> <OBJECTS> /Fe<TARGET> -link <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
 
-SET(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>")
+SET(CMAKE_COMPILE_RC_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> /fo<OBJECT> <SOURCE>")
 
 SET(CMAKE_CXX_LINK_EXECUTABLE
     "<CMAKE_CXX_COMPILER> ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} <FLAGS> <OBJECTS> /Fe<TARGET> -link <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
Index: Modules/Platform/Windows-ifort.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-ifort.cmake,v
retrieving revision 1.7
diff -u -r1.7 Windows-ifort.cmake
--- Modules/Platform/Windows-ifort.cmake	30 Apr 2008 15:33:54 -0000	1.7
+++ Modules/Platform/Windows-ifort.cmake	24 Jun 2008 12:48:06 -0000
@@ -23,7 +23,7 @@
 SET(CMAKE_Fortran_COMPILE_OBJECT
     "<CMAKE_Fortran_COMPILER>  ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO} /fpp /Fo<OBJECT> <DEFINES> <FLAGS> -c <SOURCE>${CMAKE_END_TEMP_FILE}")
 
-SET(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>")
+SET(CMAKE_COMPILE_RC_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> /fo<OBJECT> <SOURCE>")
 
 SET(CMAKE_Fortran_LINK_EXECUTABLE
     "<CMAKE_Fortran_COMPILER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} <FLAGS> /Fe<TARGET> -link <CMAKE_Fortran_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
Index: Modules/Platform/cl.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/cl.cmake,v
retrieving revision 1.6
diff -u -r1.6 cl.cmake
--- Modules/Platform/cl.cmake	27 Feb 2008 22:10:44 -0000	1.6
+++ Modules/Platform/cl.cmake	24 Jun 2008 12:48:06 -0000
@@ -60,3 +60,6 @@
 SET(CMAKE_CXX_CREATE_ASSEMBLY_SOURCE
     "<CMAKE_CXX_COMPILER> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO} <FLAGS> /TP /FAs /FoNUL /Fa<ASSEMBLY_SOURCE> /c <SOURCE>${CMAKE_END_TEMP_FILE}")
 
+# compile a RC file into an object file
+SET(CMAKE_CXX_COMPILE_OBJECT
+    "<CMAKE_RC_COMPILER> <FLAGS> /fo<OBJECT> <SOURCE>")