summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-08-19 17:26:59 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2010-08-19 17:26:59 (GMT)
commit0ea9d650f7103774825338df3ced17acd081dace (patch)
tree6871964441343ee69985a22cecf9d7cee78ccb92
parent0596f0ce78d3e0166469c83d62cf48e6cb3b7901 (diff)
parent76ed7f0556192939b63f52d061feb058fdfd689c (diff)
downloadCMake-0ea9d650f7103774825338df3ced17acd081dace.zip
CMake-0ea9d650f7103774825338df3ced17acd081dace.tar.gz
CMake-0ea9d650f7103774825338df3ced17acd081dace.tar.bz2
Merge topic 'msvc-version'
76ed7f0 Set MSVC_VERSION for MSVC 6, 7, 7.1 (#7944)
-rw-r--r--Modules/CMakeVS6FindMake.cmake1
-rw-r--r--Modules/CMakeVS71FindMake.cmake1
-rw-r--r--Modules/CMakeVS7FindMake.cmake1
3 files changed, 3 insertions, 0 deletions
diff --git a/Modules/CMakeVS6FindMake.cmake b/Modules/CMakeVS6FindMake.cmake
index 6a73905..dccf8c4 100644
--- a/Modules/CMakeVS6FindMake.cmake
+++ b/Modules/CMakeVS6FindMake.cmake
@@ -22,3 +22,4 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM
)
MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)
SET(MSVC60 1)
+SET(MSVC_VERSION 1200)
diff --git a/Modules/CMakeVS71FindMake.cmake b/Modules/CMakeVS71FindMake.cmake
index bb03e7a..2381adb 100644
--- a/Modules/CMakeVS71FindMake.cmake
+++ b/Modules/CMakeVS71FindMake.cmake
@@ -23,3 +23,4 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM
)
MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)
SET(MSVC71 1)
+SET(MSVC_VERSION 1310)
diff --git a/Modules/CMakeVS7FindMake.cmake b/Modules/CMakeVS7FindMake.cmake
index 99c953e..665158c 100644
--- a/Modules/CMakeVS7FindMake.cmake
+++ b/Modules/CMakeVS7FindMake.cmake
@@ -22,3 +22,4 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM
)
MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)
SET(MSVC70 1)
+SET(MSVC_VERSION 1300)