From 8cd66dc0d275208367dd6b5ef266395ef92ed424 Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Tue, 21 Jun 2011 15:58:11 -0400
Subject: [PATCH] Use devenv instead of msbuild for vs2010.

---
 Modules/CMakeVS10FindMake.cmake | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/Modules/CMakeVS10FindMake.cmake b/Modules/CMakeVS10FindMake.cmake
index af5f3a7d5..388203cab 100644
--- a/Modules/CMakeVS10FindMake.cmake
+++ b/Modules/CMakeVS10FindMake.cmake
@@ -1,6 +1,6 @@
 
 #=============================================================================
-# Copyright 2009 Kitware, Inc.
+# Copyright 2007-2009 Kitware, Inc.
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
@@ -12,17 +12,28 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-# We use MSBuild as the build tool for VS 10
-FIND_PROGRAM(CMAKE_MAKE_PROGRAM
-  NAMES MSBuild
-  HINTS
-  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VS;ProductDir]
-  "$ENV{SYSTEMROOT}/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0;CLR Version]/"
-  "c:/WINDOWS/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0;CLR Version]/"
-  "$ENV{SYSTEMROOT}/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\10.0;CLR Version]/"
-  )
+# VCExpress does not support cross compiling, which is necessary for Win CE
+SET( _CMAKE_MAKE_PROGRAM_NAMES devenv)
+IF(NOT CMAKE_CROSSCOMPILING)
+  SET( _CMAKE_MAKE_PROGRAM_NAMES ${_CMAKE_MAKE_PROGRAM_NAMES} VCExpress)
+ENDIF(NOT CMAKE_CROSSCOMPILING)
 
+FIND_PROGRAM(CMAKE_MAKE_PROGRAM
+  NAMES ${_CMAKE_MAKE_PROGRAM_NAMES}
+  HINTS
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VS;EnvironmentDirectory]
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup;Dbghelp_path]
+  "$ENV{ProgramFiles}/Microsoft Visual Studio 10.0/Common7/IDE"
+  "$ENV{ProgramFiles}/Microsoft Visual Studio10.0/Common7/IDE"
+  "$ENV{ProgramFiles}/Microsoft Visual Studio 10/Common7/IDE"
+  "$ENV{ProgramFiles}/Microsoft Visual Studio10/Common7/IDE"
+  "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio 10.0/Common7/IDE"
+  "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio10.0/Common7/IDE"
+  "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio 10/Common7/IDE"
+  "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio10/Common7/IDE"
+  "/Program Files/Microsoft Visual Studio 10.0/Common7/IDE/"
+  "/Program Files/Microsoft Visual Studio 10/Common7/IDE/"
+  )
 MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)
 SET(MSVC10 1)
 SET(MSVC_VERSION 1600)
-