From 46e9ff57298b58b3a4669adcb913429b691ce5bb Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 20 Oct 2021 12:12:35 -0400 Subject: 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 --- Source/cmGlobalXCodeGenerator.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'Source/cmGlobalXCodeGenerator.h') diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h index 72af4a40ad..4d7ee9010b 100644 --- a/Source/cmGlobalXCodeGenerator.h +++ b/Source/cmGlobalXCodeGenerator.h @@ -138,11 +138,6 @@ protected: void AddExtraIDETargets() override; void Generate() override; - FindMakeProgramStage GetFindMakeProgramStage() const override - { - return FindMakeProgramStage::Early; - } - private: enum EmbedActionFlags { -- cgit v1.2.1