diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-20 16:12:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-10-20 17:00:26 (GMT) |
| commit | 46e9ff57298b58b3a4669adcb913429b691ce5bb (patch) | |
| tree | 62a8bd3b70b4f5a0f827d05b306c97ed6b11781f /Source/cmGlobalGenerator.h | |
| parent | 42418b02f769858d68ce21a58dab3025d30f31a2 (diff) | |
| download | CMake-46e9ff57298b58b3a4669adcb913429b691ce5bb.zip CMake-46e9ff57298b58b3a4669adcb913429b691ce5bb.tar.gz CMake-46e9ff57298b58b3a4669adcb913429b691ce5bb.tar.bz2 | |
Restore honoring CMAKE_GENERATOR_INSTANCE in toolchain file
Revert the changes from commit d5b5c19278 (cmGlobalGenerator:
FindMakeProgram() before CMakeDetermineSystem, 2020-06-15,
v3.19.0-rc1~619^2~3) and commit ef91fb02f3 (cmGlobalGenerator:
FindMakeProgram() at a generator-specific time, 2020-11-23,
v3.19.1~2^2). We must delay selecting the location of MSBuild until
after an instance of Visual Studio has been selected.
It is now safe to revert the ordering because the motivating use
case (sysroot detection in Platform/Android-Determine) has been
implemented another way.
Fixes: #22782
Diffstat (limited to 'Source/cmGlobalGenerator.h')
| -rw-r--r-- | Source/cmGlobalGenerator.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 074da4e..cc0ad29 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -625,17 +625,6 @@ protected: std::string GetPredefinedTargetsFolder() const; - enum class FindMakeProgramStage - { - Early, - Late, - }; - - virtual FindMakeProgramStage GetFindMakeProgramStage() const - { - return FindMakeProgramStage::Late; - } - private: using TargetMap = std::unordered_map<std::string, cmTarget*>; using GeneratorTargetMap = |