diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-11-23 19:20:08 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2020-11-23 19:20:08 (GMT) |
| commit | ef91fb02f3658954b631e46858e254008ca58132 (patch) | |
| tree | adf5e1de4a729c07eacc90e41722da39c46f40c5 /Source/cmGlobalXCodeGenerator.h | |
| parent | d1b6879ececa9fd24d346ddb6c3474cada9f1823 (diff) | |
| download | CMake-ef91fb02f3658954b631e46858e254008ca58132.zip CMake-ef91fb02f3658954b631e46858e254008ca58132.tar.gz CMake-ef91fb02f3658954b631e46858e254008ca58132.tar.bz2 | |
cmGlobalGenerator: FindMakeProgram() at a generator-specific time
d5b5c192 moved FindMakeProgram() to an earlier time, which resulted
in CMAKE_MAKE_PROGRAM not being read from the toolchain file. Change
it to only call FindMakeProgram() early in the specific cases of
Visual Studio and Xcode, and restore the old behavior for all other
generators.
Fixes: #21486
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.h')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h index 5b05214..ab5eeb2 100644 --- a/Source/cmGlobalXCodeGenerator.h +++ b/Source/cmGlobalXCodeGenerator.h @@ -124,6 +124,11 @@ protected: void AddExtraIDETargets() override; void Generate() override; + FindMakeProgramStage GetFindMakeProgramStage() const override + { + return FindMakeProgramStage::Early; + } + private: bool ParseGeneratorToolset(std::string const& ts, cmMakefile* mf); bool ProcessGeneratorToolsetField(std::string const& key, |