ENH: major changes to support addition of languages from cmake modules directory.

16 files changed, 76 insertions, 72 deletions

diff --git a/Modules/Platform/AIX.cmake b/Modules/Platform/AIX.cmake
index 7f17c83..ea6ebef 100644
--- a/Modules/Platform/AIX.cmake
+++ b/Modules/Platform/AIX.cmake
@@ -2,7 +2,7 @@ SET(CMAKE_SHARED_LIBRARY_PREFIX "lib")          # lib
 SET(CMAKE_SHARED_LIBRARY_SUFFIX ".so")          # .so
 SET(CMAKE_DL_LIBS "-lld")
 SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-G -Wl,-brtl")  # -shared
-SET(CMAKE_SHARED_LIBRARY_LINK_FLAGS "-Wl,-brtl,-bexpall")  # +s, flag for exe link to use shared lib
+SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-Wl,-brtl,-bexpall")  # +s, flag for exe link to use shared lib
 IF(CMAKE_COMPILER_IS_GNUCXX) 
   SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-shared -Wl,-G")       # -shared
 ENDIF(CMAKE_COMPILER_IS_GNUCXX) 
diff --git a/Modules/Platform/FreeBSD.cmake b/Modules/Platform/FreeBSD.cmake
index e5c03cb..10c4811 100644
--- a/Modules/Platform/FreeBSD.cmake
+++ b/Modules/Platform/FreeBSD.cmake
@@ -2,8 +2,8 @@ IF(EXISTS /usr/include/dlfcn.h)
   SET(CMAKE_DL_LIBS "")
   SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")            # -pic 
   SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")       # -shared
-  SET(CMAKE_SHARED_LIBRARY_LINK_FLAGS "")         # +s, flag for exe link to use shared lib
-  SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG "-Wl,-rpath,")       # -rpath
-  SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG_SEP ":")   # : or empty
+  SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")         # +s, flag for exe link to use shared lib
+  SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")       # -rpath
+  SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")   # : or empty
 ENDIF(EXISTS /usr/include/dlfcn.h)
 # include the gcc flags 
diff --git a/Modules/Platform/HP-UX.cmake b/Modules/Platform/HP-UX.cmake
index 76cb677..b2b9e03 100644
--- a/Modules/Platform/HP-UX.cmake
+++ b/Modules/Platform/HP-UX.cmake
@@ -1,15 +1,15 @@
 SET(CMAKE_SHARED_LIBRARY_SUFFIX ".sl")          # .so
 SET(CMAKE_DL_LIBS "-ldld")
 
-SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG_SEP ":")   # : or empty
+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")   # : or empty
 
 # fortran
 IF(CMAKE_COMPILER_IS_GNUG77)
   SET(CMAKE_SHARED_LIBRARY_Fortran_FLAGS "-fPIC")            # -pic 
   SET(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS "-shared -Wl,-E -Wl,-b")       # -shared
-  SET(CMAKE_SHARED_LIBRARY_LINK_FLAGS "-Wl,+s -Wl,-E")  # +s, flag for exe link to use shared lib
-  SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG "-Wl,+b")       # -rpath
-  SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG_SEP ":")   # : or empty
+  SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-Wl,+s -Wl,-E")  # +s, flag for exe link to use shared lib
+  SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,+b")       # -rpath
+  SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")   # : or empty
   SET(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG "-Wl,+h")
   SET(CMAKE_SHARED_LIBRARY_Fortran_FLAGS "-fPIC")     # -pic 
 ELSE(CMAKE_COMPILER_IS_GNUG77)
@@ -18,8 +18,8 @@ ELSE(CMAKE_COMPILER_IS_GNUG77)
       "ld <CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG><TARGET_SONAME> <LINK_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
   SET(CMAKE_SHARED_LIBRARY_Fortran_FLAGS "+Z")            # -pic 
   SET(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS "-E -b -L/usr/lib")       # -shared
-  SET(CMAKE_SHARED_LIBRARY_LINK_FLAGS "-Wl,+s -Wl,-E")  # +s, flag for exe link to use shared lib
-  SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG "+b")       # -rpath
+  SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-Wl,+s -Wl,-E")  # +s, flag for exe link to use shared lib
+  SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "+b")       # -rpath
   SET(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG "+h")
 ENDIF(CMAKE_COMPILER_IS_GNUG77)
 # C compiler
@@ -27,9 +27,9 @@ IF(CMAKE_COMPILER_IS_GNUCC)
   # gnu gcc
   SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")            # -pic 
   SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -Wl,-E -Wl,-b")       # -shared
-  SET(CMAKE_SHARED_LIBRARY_LINK_FLAGS "-Wl,+s -Wl,-E")  # +s, flag for exe link to use shared lib
-  SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG "-Wl,+b")       # -rpath
-  SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG_SEP ":")   # : or empty
+  SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-Wl,+s -Wl,-E")  # +s, flag for exe link to use shared lib
+  SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,+b")       # -rpath
+  SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")   # : or empty
   SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,+h")
   SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")     # -pic 
 ELSE(CMAKE_COMPILER_IS_GNUCC)
@@ -40,8 +40,8 @@ ELSE(CMAKE_COMPILER_IS_GNUCC)
       "ld <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_C_FLAG><TARGET_SONAME> <LINK_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
   SET(CMAKE_SHARED_LIBRARY_C_FLAGS "+Z")            # -pic 
   SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-E -b -L/usr/lib")       # -shared
-  SET(CMAKE_SHARED_LIBRARY_LINK_FLAGS "-Wl,+s -Wl,-E")  # +s, flag for exe link to use shared lib
-  SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG "+b")       # -rpath
+  SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-Wl,+s -Wl,-E")  # +s, flag for exe link to use shared lib
+  SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "+b")       # -rpath
   SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "+h")
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
diff --git a/Modules/Platform/IRIX.cmake b/Modules/Platform/IRIX.cmake
index 96c8258..861f016 100644
--- a/Modules/Platform/IRIX.cmake
+++ b/Modules/Platform/IRIX.cmake
@@ -1,8 +1,8 @@
 SET(CMAKE_DL_LIBS "")
 SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -rdata_shared")
 SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-shared -rdata_shared") 
-SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG "-Wl,-rpath,")       # -rpath
-SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG_SEP "")   # : or empty
+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")       # -rpath
+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP "")   # : or empty
 IF(NOT CMAKE_COMPILER_IS_GNUCXX)
   SET(CMAKE_CXX_CREATE_STATIC_LIBRARY
       "<CMAKE_CXX_COMPILER> -ar -o <TARGET> <OBJECTS>")
diff --git a/Modules/Platform/IRIX64.cmake b/Modules/Platform/IRIX64.cmake
index 1d556fb..1797e4a 100644
--- a/Modules/Platform/IRIX64.cmake
+++ b/Modules/Platform/IRIX64.cmake
@@ -1,8 +1,8 @@
 SET(CMAKE_DL_LIBS "")
 SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -rdata_shared")
 SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-shared -rdata_shared") 
-SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG "-Wl,-rpath,")       # -rpath
-SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG_SEP "")   # : or empty
+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")       # -rpath
+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP "")   # : or empty
 SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
 SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
 IF(NOT CMAKE_COMPILER_IS_GNUCXX)
diff --git a/Modules/Platform/Linux-como.cmake b/Modules/Platform/Linux-como.cmake
index 2b66995..6c259f3 100644
--- a/Modules/Platform/Linux-como.cmake
+++ b/Modules/Platform/Linux-como.cmake
@@ -13,6 +13,6 @@ SET(CMAKE_CXX_LINK_EXECUTABLE
     "<CMAKE_CXX_COMPILER> --prelink_objects <OBJECTS>"
     "<CMAKE_CXX_COMPILER> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <FLAGS> <OBJECTS>  -o <TARGET> <LINK_LIBRARIES>")
 
-SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG "")
+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "")
 SET(CMAKE_SHARED_LIBRARY_C_FLAGS "")
-SET(CMAKE_SHARED_LIBRARY_LINK_FLAGS "")
+SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake
index 6e76a2f..5040b5e 100644
--- a/Modules/Platform/Linux.cmake
+++ b/Modules/Platform/Linux.cmake
@@ -2,8 +2,8 @@
 SET(CMAKE_DL_LIBS "-ldl")
 SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")        
 SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
-SET(CMAKE_SHARED_LIBRARY_LINK_FLAGS "-rdynamic")  
-SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG "-Wl,-rpath,")
-SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG_SEP ":")
+SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-rdynamic")  
+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
 SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
 SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
diff --git a/Modules/Platform/MP-RAS.cmake b/Modules/Platform/MP-RAS.cmake
index 5a644dc..2b2fe47 100644
--- a/Modules/Platform/MP-RAS.cmake
+++ b/Modules/Platform/MP-RAS.cmake
@@ -2,7 +2,7 @@ IF(CMAKE_SYSTEM MATCHES "MP-RAS-02*.")
   SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-K PIC")
 ELSE(CMAKE_SYSTEM MATCHES "MP-RAS-02*.")
   SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-K PIC")
-  SET(CMAKE_SHARED_LIBRARY_LINK_FLAGS "-Wl,-Bexport")
+  SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-Wl,-Bexport")
 ENDIF(CMAKE_SYSTEM MATCHES "MP-RAS-02*.")
 
 
diff --git a/Modules/Platform/NetBSD.cmake b/Modules/Platform/NetBSD.cmake
index e9c9ab2..c67e5d4 100644
--- a/Modules/Platform/NetBSD.cmake
+++ b/Modules/Platform/NetBSD.cmake
@@ -2,7 +2,7 @@ IF(EXISTS /usr/include/dlfcn.h)
   SET(CMAKE_DL_LIBS "")
   SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")            # -pic 
   SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")       # -shared
-  SET(CMAKE_SHARED_LIBRARY_LINK_FLAGS "")         # +s, flag for exe link to use shared lib
-  SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG "-Wl,-rpath,")       # -rpath
-  SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG_SEP ":")   # : or empty
+  SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")         # +s, flag for exe link to use shared lib
+  SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")       # -rpath
+  SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")   # : or empty
 ENDIF(EXISTS /usr/include/dlfcn.h)
diff --git a/Modules/Platform/OSF1.cmake b/Modules/Platform/OSF1.cmake
index d501c2d..37559bf 100644
--- a/Modules/Platform/OSF1.cmake
+++ b/Modules/Platform/OSF1.cmake
@@ -19,11 +19,11 @@ IF(CMAKE_SYSTEM MATCHES "OSF1-V.*")
     SET(CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG "-rpath ")
   ENDIF(CMAKE_COMPILER_IS_GNUCXX)
   IF(CMAKE_COMPILER_IS_GNUCC)
-    SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG "-Wl,-rpath,")  
+    SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")  
   ELSE(CMAKE_COMPILER_IS_GNUCC)
-    SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG "-rpath ")
+    SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-rpath ")
   ENDIF(CMAKE_COMPILER_IS_GNUCC)
-  SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG_SEP ":")
+  SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
 ENDIF(CMAKE_SYSTEM MATCHES "OSF1-V.*")
 
 
diff --git a/Modules/Platform/RISCos.cmake b/Modules/Platform/RISCos.cmake
index 1979d5e..7d12564 100644
--- a/Modules/Platform/RISCos.cmake
+++ b/Modules/Platform/RISCos.cmake
@@ -1,4 +1,4 @@
 SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-G 0")
 SET(CMAKE_SHARED_LIBRARY_SUFFIX "..o")
 SET(CMAKE_DL_LIBS "")
-SET(CMAKE_SHARED_LIBRARY_LINK_FLAGS "-Wl,-D,08000000")
+SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-Wl,-D,08000000")
diff --git a/Modules/Platform/SunOS.cmake b/Modules/Platform/SunOS.cmake
index 5e81314..f2846bc 100644
--- a/Modules/Platform/SunOS.cmake
+++ b/Modules/Platform/SunOS.cmake
@@ -1,8 +1,8 @@
 IF(CMAKE_SYSTEM MATCHES "SunOS-4.*")
    SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-PIC") 
    SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -Wl,-r") 
-   SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG "-Wl,-R")
-   SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG_SEP ":")  
+   SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-R")
+   SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")  
    SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-h")
    SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-h")
 ENDIF(CMAKE_SYSTEM MATCHES "SunOS-4.*")
@@ -10,8 +10,8 @@ ENDIF(CMAKE_SYSTEM MATCHES "SunOS-4.*")
 IF(CMAKE_SYSTEM MATCHES "SunOS-5*.")
   SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-KPIC") 
   SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-G")
-  SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG "-R")
-  SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG_SEP ":")
+  SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-R")
+  SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
   SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-h")
   SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-h")
   SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "-KPIC") 
@@ -21,8 +21,8 @@ IF(CMAKE_SYSTEM MATCHES "SunOS-5*.")
   IF(CMAKE_COMPILER_IS_GNUCC)
     SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") 
     SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
-    SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG "-Wl,-R")
-    SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG_SEP ":")  
+    SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-R")
+    SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")  
     SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-h")
   ENDIF(CMAKE_COMPILER_IS_GNUCC)
   IF(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/Modules/Platform/ULTRIX.cmake b/Modules/Platform/ULTRIX.cmake
index 4064721..024fa1a 100644
--- a/Modules/Platform/ULTRIX.cmake
+++ b/Modules/Platform/ULTRIX.cmake
@@ -1,4 +1,4 @@
 SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-G 0")
 SET(CMAKE_SHARED_LIBRARY_SUFFIX "..o") 
 SET(CMAKE_DL_LIBS "")
-SET(CMAKE_SHARED_LIBRARY_LINK_FLAGS "-Wl,-D,08000000")
+SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-Wl,-D,08000000")
diff --git a/Modules/Platform/UNIX_SV.cmake b/Modules/Platform/UNIX_SV.cmake
index 62b0e59..d9be199 100644
--- a/Modules/Platform/UNIX_SV.cmake
+++ b/Modules/Platform/UNIX_SV.cmake
@@ -1,2 +1,2 @@
 SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-K PIC")
-SET(CMAKE_SHARED_LIBRARY_LINK_FLAGS "-Wl,-Bexport")
+SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-Wl,-Bexport")
diff --git a/Modules/Platform/Windows-cl.cmake b/Modules/Platform/Windows-cl.cmake
index f71beb7..32f8396 100644
--- a/Modules/Platform/Windows-cl.cmake
+++ b/Modules/Platform/Windows-cl.cmake
@@ -32,6 +32,7 @@ SET(CMAKE_C_COMPILE_OBJECT
 SET(CMAKE_C_LINK_EXECUTABLE
     "<CMAKE_C_COMPILER> /nologo ${CMAKE_START_TEMP_FILE} <FLAGS> <OBJECTS> /Fe<TARGET> -link <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
 
+ENABLE_LANGUAGE(RC)
 SET(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>")
 
 SET(CMAKE_CXX_LINK_EXECUTABLE
@@ -60,35 +61,38 @@ IF(CMAKE_GENERATOR MATCHES  "Visual Studio 8")
   SET(CMAKE_COMPILER_2005 1)
 ENDIF(CMAKE_GENERATOR MATCHES  "Visual Studio 8")
 IF(CMAKE_GENERATOR MATCHES "NMake Makefiles")
-  EXEC_PROGRAM(${CMAKE_C_COMPILER} 
-    ARGS /nologo -EP \"${CMAKE_ROOT}/Modules/CMakeTestNMakeCLVersion.c\" 
-    OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT 
-    RETURN_VALUE CMAKE_COMPILER_RETURN
-    )
-  IF(NOT CMAKE_COMPILER_RETURN)
-    IF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*VERSION=1[3-9][0-9][0-9].*" )
-      SET(CMAKE_COMPILER_SUPPORTS_PDBTYPE 0)
-    ENDIF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*VERSION=1[3-9][0-9][0-9].*" )
-    IF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*VERSION=1[4-9][0-9][0-9].*" )
-      SET(CMAKE_COMPILER_2005 1)
-    ENDIF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*VERSION=1[4-9][0-9][0-9].*" )
-  ENDIF(NOT CMAKE_COMPILER_RETURN)
-  MAKE_DIRECTORY("${CMAKE_BINARY_DIR}/CMakeTmp")
-  # try to figure out if we are running the free command line
-  # tools from Microsoft.  These tools do not provide debug libraries,
-  # so the link flags used have to be different.
-  EXEC_PROGRAM(${CMAKE_CXX_COMPILER} ${CMAKE_BINARY_DIR}/CMakeTmp
-    ARGS /nologo /MD /EHsc
-    \"${CMAKE_ROOT}/Modules/CMakeTestForFreeVC.cxx\"
-    OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT 
-    RETURN_VALUE CMAKE_COMPILER_RETURN
-    )
-  IF(CMAKE_COMPILER_RETURN)
-    SET(CMAKE_USING_VC_FREE_TOOLS 1)
-  ELSE(CMAKE_COMPILER_RETURN)
-    SET(CMAKE_USING_VC_FREE_TOOLS 0)
-  ENDIF(CMAKE_COMPILER_RETURN)
-
+  IF(NOT CMAKE_VC_COMPILER_TESTS_RUN)
+    SET(CMAKE_VC_COMPILER_TESTS 1)
+    EXEC_PROGRAM(${CMAKE_C_COMPILER} 
+      ARGS /nologo -EP \"${CMAKE_ROOT}/Modules/CMakeTestNMakeCLVersion.c\" 
+      OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT 
+      RETURN_VALUE CMAKE_COMPILER_RETURN
+      )
+    IF(NOT CMAKE_COMPILER_RETURN)
+      IF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*VERSION=1[3-9][0-9][0-9].*" )
+        SET(CMAKE_COMPILER_SUPPORTS_PDBTYPE 0)
+      ENDIF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*VERSION=1[3-9][0-9][0-9].*" )
+      IF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*VERSION=1[4-9][0-9][0-9].*" )
+        SET(CMAKE_COMPILER_2005 1)
+      ENDIF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*VERSION=1[4-9][0-9][0-9].*" )
+    ENDIF(NOT CMAKE_COMPILER_RETURN)
+    # try to figure out if we are running the free command line
+    # tools from Microsoft.  These tools do not provide debug libraries,
+    # so the link flags used have to be different.
+    MAKE_DIRECTORY("${CMAKE_BINARY_DIR}/CMakeTmp2")
+    EXEC_PROGRAM(${CMAKE_CXX_COMPILER} ${CMAKE_BINARY_DIR}/CMakeTmp2
+      ARGS /nologo /MD /EHsc
+      \"${CMAKE_ROOT}/Modules/CMakeTestForFreeVC.cxx\"
+      OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT 
+      RETURN_VALUE CMAKE_COMPILER_RETURN
+      )
+    IF(CMAKE_COMPILER_RETURN)
+      SET(CMAKE_USING_VC_FREE_TOOLS 1)
+    ELSE(CMAKE_COMPILER_RETURN)
+      SET(CMAKE_USING_VC_FREE_TOOLS 0)
+    ENDIF(CMAKE_COMPILER_RETURN)
+    SET(CMAKE_VC_COMPILER_TESTS_RUN 1 CACHE INTERNAL "") 
+  ENDIF(NOT CMAKE_VC_COMPILER_TESTS_RUN)
 ENDIF(CMAKE_GENERATOR MATCHES "NMake Makefiles")
 
 
diff --git a/Modules/Platform/Windows-gcc.cmake b/Modules/Platform/Windows-gcc.cmake
index ab1c866..7ab664b 100644
--- a/Modules/Platform/Windows-gcc.cmake
+++ b/Modules/Platform/Windows-gcc.cmake
@@ -8,8 +8,8 @@ SET(CMAKE_SHARED_MODULE_SUFFIX ".dll")          # .so
 SET(CMAKE_DL_LIBS "")
 SET(CMAKE_SHARED_LIBRARY_C_FLAGS "")            # -pic 
 SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")       # -shared
-SET(CMAKE_SHARED_LIBRARY_LINK_FLAGS "")         # +s, flag for exe link to use shared lib
-SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG "")       # -rpath
-SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG_SEP "")   # : or empty
+SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")         # +s, flag for exe link to use shared lib
+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "")       # -rpath
+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP "")   # : or empty
 SET(CMAKE_LIBRARY_PATH_FLAG "-L")
 SET(CMAKE_LINK_LIBRARY_FLAG "-l")