mirror of
https://github.com/Kitware/CMake.git
synced 2026-02-22 06:59:01 -06:00
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.
This commit is contained in:
@@ -82,6 +82,8 @@ public:
|
||||
};
|
||||
class OrderedTargetDependSet;
|
||||
|
||||
virtual void FindMakeProgram(cmMakefile*);
|
||||
|
||||
protected:
|
||||
// Does this VS version link targets to each other if there are
|
||||
// dependencies in the SLN file? This was done for VS versions
|
||||
@@ -107,6 +109,7 @@ protected:
|
||||
const char* AdditionalPlatformDefinition;
|
||||
|
||||
private:
|
||||
virtual std::string GetVSMakeProgram() = 0;
|
||||
void PrintCompilerAdvice(std::ostream&, std::string, const char*) {}
|
||||
void ComputeTargetObjects(cmGeneratorTarget* gt) const;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user