summaryrefslogtreecommitdiffstats
path: root/Modules/CMakeVS10FindMake.cmake
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2009-07-10 13:12:39 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2009-07-10 13:12:39 (GMT)
commit5c4208f50e30a601b0cddd238232ca3f0db833af (patch)
tree507f16e1f2c2dadd822ea586bd289a6708ad82bc /Modules/CMakeVS10FindMake.cmake
parent3199db4794722f3cfde50b364545517fcb4d370c (diff)
downloadCMake-5c4208f50e30a601b0cddd238232ca3f0db833af.zip
CMake-5c4208f50e30a601b0cddd238232ca3f0db833af.tar.gz
CMake-5c4208f50e30a601b0cddd238232ca3f0db833af.tar.bz2
ENH: only 5 failing tests for VS 10
Diffstat (limited to 'Modules/CMakeVS10FindMake.cmake')
-rw-r--r--Modules/CMakeVS10FindMake.cmake8
1 files changed, 8 insertions, 0 deletions
diff --git a/Modules/CMakeVS10FindMake.cmake b/Modules/CMakeVS10FindMake.cmake
index 04d5e81..ce79641 100644
--- a/Modules/CMakeVS10FindMake.cmake
+++ b/Modules/CMakeVS10FindMake.cmake
@@ -6,6 +6,13 @@ IF(NOT CMAKE_CROSSCOMPILING)
ENDIF(NOT CMAKE_CROSSCOMPILING)
FIND_PROGRAM(CMAKE_MAKE_PROGRAM
+ NAMES MSBuild
+ HINTS
+ "$ENV{SYSTEMROOT}/Microsoft.NET/Framework/v4.0.20506/"
+ c:/WINDOWS/Microsoft.NET/Framework/v4.0.20506/
+ )
+
+FIND_PROGRAM(CMAKE_MAKE_PROGRAM
NAMES ${_CMAKE_MAKE_PROGRAM_NAMES}
HINTS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VS;EnvironmentDirectory]
@@ -25,6 +32,7 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM
"$ENV{ProgramFiles}/Microsoft Visual Studio .NET/Common7/IDE"
)
+
MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)
SET(MSVC10 1)
SET(MSVC_VERSION 1600)