diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-21 13:21:12 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-10-21 13:21:23 (GMT) |
| commit | b0c62a133e10c0706e0260ebc4094faa53fef616 (patch) | |
| tree | 71d8f10becb4938db85305981db7542a57294a1d /Source/cmGlobalVisualStudioGenerator.h | |
| parent | d97497ee65d94cec1494064bbe40963c7a7de6fc (diff) | |
| parent | 46e9ff57298b58b3a4669adcb913429b691ce5bb (diff) | |
| download | CMake-b0c62a133e10c0706e0260ebc4094faa53fef616.zip CMake-b0c62a133e10c0706e0260ebc4094faa53fef616.tar.gz CMake-b0c62a133e10c0706e0260ebc4094faa53fef616.tar.bz2 | |
Merge topic 'vs-instance' into release-3.22
46e9ff5729 Restore honoring CMAKE_GENERATOR_INSTANCE in toolchain file
42418b02f7 Android: Refactor sysroot detection under Visual Studio
44a86d0b38 cmake_host_system_information: Add undocumented VS_MSBUILD_COMMAND key
6999b87133 cmGlobalVisualStudio10Generator: Add method to find MSBuild early
7f730464be cmGlobalGenerator: Add method to check if generator is at least VS 10
8917b8512f cmGlobalVisualStudioVersionedGenerator: Allow repeating SetGeneratorInstance
6511654164 cmGlobalVisualStudio10Generator: Allow subclasses to reset MSBuild search
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6646
Diffstat (limited to 'Source/cmGlobalVisualStudioGenerator.h')
| -rw-r--r-- | Source/cmGlobalVisualStudioGenerator.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h index d1bd6b1..23c8a02 100644 --- a/Source/cmGlobalVisualStudioGenerator.h +++ b/Source/cmGlobalVisualStudioGenerator.h @@ -167,11 +167,6 @@ protected: void WriteSLNHeader(std::ostream& fout); - FindMakeProgramStage GetFindMakeProgramStage() const override - { - return FindMakeProgramStage::Early; - } - bool ComputeTargetDepends() override; class VSDependSet : public std::set<std::string> { |