diff options
| author | Brad King <brad.king@kitware.com> | 2013-11-15 10:41:45 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-11-18 11:30:50 -0500 |
| commit | 558c74d0abfe4f4fc8563ba615b7329083d232bc (patch) | |
| tree | 31b9d14dc5f90065b28543890a1ab38716bfa571 /Source/cmGlobalVisualStudio11Generator.cxx | |
| parent | 5229f2df63369af1734783ee190cbfc7c41fac8f (diff) | |
| download | cmake-558c74d0abfe4f4fc8563ba615b7329083d232bc.tar.gz | |
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 'Source/cmGlobalVisualStudio11Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio11Generator.cxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx index d968c6de70..f1d7312484 100644 --- a/Source/cmGlobalVisualStudio11Generator.cxx +++ b/Source/cmGlobalVisualStudio11Generator.cxx @@ -112,7 +112,6 @@ cmGlobalVisualStudio11Generator::cmGlobalVisualStudio11Generator( : cmGlobalVisualStudio10Generator(name, platformName, additionalPlatformDefinition) { - this->FindMakeProgramFile = "CMakeVS11FindMake.cmake"; std::string vc11Express; this->ExpressEdition = cmSystemTools::ReadRegistryValue( "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\11.0\\Setup\\VC;" |