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 /Source/cmGlobalVisualStudio10Generator.h | |
| 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 'Source/cmGlobalVisualStudio10Generator.h')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h index ad0aa6d..66440ea 100644 --- a/Source/cmGlobalVisualStudio10Generator.h +++ b/Source/cmGlobalVisualStudio10Generator.h @@ -118,5 +118,6 @@ private: bool MSBuildCommandInitialized; virtual std::string FindMSBuildCommand(); virtual std::string FindDevEnvCommand(); + virtual std::string GetVSMakeProgram() { return this->GetMSBuildCommand(); } }; #endif |