diff options
| author | Brad King <brad.king@kitware.com> | 2013-11-15 15:41:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-11-18 16:30:50 (GMT) |
| commit | 558c74d0abfe4f4fc8563ba615b7329083d232bc (patch) | |
| tree | 31b9d14dc5f90065b28543890a1ab38716bfa571 /Modules/CMakeVS71FindMake.cmake | |
| parent | 5229f2df63369af1734783ee190cbfc7c41fac8f (diff) | |
| download | CMake-558c74d0abfe4f4fc8563ba615b7329083d232bc.zip CMake-558c74d0abfe4f4fc8563ba615b7329083d232bc.tar.gz CMake-558c74d0abfe4f4fc8563ba615b7329083d232bc.tar.bz2 | |
VS: Switch to internal CMAKE_MAKE_PROGRAM lookup by generators
Drop the "Modules/CMakeVS*FindMake.cmake" files. Override the
cmGlobalGenerator::FindMakeProgram method for VS generators to use their
internal APIs to locate the build tool. Set the CMAKE_MAKE_PROGRAM as a
normal variable for use by project code, but do not cache it. This will
allow CMake and CTest to select the proper tool at build time.
Diffstat (limited to 'Modules/CMakeVS71FindMake.cmake')
| -rw-r--r-- | Modules/CMakeVS71FindMake.cmake | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/Modules/CMakeVS71FindMake.cmake b/Modules/CMakeVS71FindMake.cmake deleted file mode 100644 index 945c3fa..0000000 --- a/Modules/CMakeVS71FindMake.cmake +++ /dev/null @@ -1,26 +0,0 @@ - -#============================================================================= -# Copyright 2003-2009 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -find_program(CMAKE_MAKE_PROGRAM - NAMES devenv - PATHS - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\7.1\\Setup\\VS;EnvironmentDirectory] - "$ENV{ProgramFiles}/Microsoft Visual Studio .NET/Common7/IDE" - "c:/Program Files/Microsoft Visual Studio .NET/Common7/IDE" - "c:/Program Files/Microsoft Visual Studio.NET/Common7/IDE" - "/Program Files/Microsoft Visual Studio .NET/Common7/IDE/" - ) -mark_as_advanced(CMAKE_MAKE_PROGRAM) -set(MSVC71 1) -set(MSVC_VERSION 1310) |