summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalGenerator.h
diff options
context:
space:
mode:
authorKyle Edwards <kyle.edwards@kitware.com>2020-11-23 19:20:08 (GMT)
committerKyle Edwards <kyle.edwards@kitware.com>2020-11-23 19:20:08 (GMT)
commitef91fb02f3658954b631e46858e254008ca58132 (patch)
treeadf5e1de4a729c07eacc90e41722da39c46f40c5 /Source/cmGlobalGenerator.h
parentd1b6879ececa9fd24d346ddb6c3474cada9f1823 (diff)
downloadCMake-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/cmGlobalGenerator.h')
-rw-r--r--Source/cmGlobalGenerator.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index b532a43..c106258 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -597,6 +597,17 @@ protected:
std::string GetPredefinedTargetsFolder();
+ enum class FindMakeProgramStage
+ {
+ Early,
+ Late,
+ };
+
+ virtual FindMakeProgramStage GetFindMakeProgramStage() const
+ {
+ return FindMakeProgramStage::Late;
+ }
+
private:
using TargetMap = std::unordered_map<std::string, cmTarget*>;
using GeneratorTargetMap =