summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio10Generator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-08-10 15:27:37 (GMT)
committerKitware Robot <kwrobot@kitware.com>2023-08-10 15:27:48 (GMT)
commit661e005a0ef629b047a1a3ae6c2e524e618fbf6b (patch)
tree96d5f58f59e3376405e1e91e9df736a3b59e2114 /Source/cmGlobalVisualStudio10Generator.cxx
parentf6cda8676781786c5aa05b3a9838695b395b2ae8 (diff)
parentd5118ed2e5d386be829869cffb681c38d551deae (diff)
downloadCMake-661e005a0ef629b047a1a3ae6c2e524e618fbf6b.zip
CMake-661e005a0ef629b047a1a3ae6c2e524e618fbf6b.tar.gz
CMake-661e005a0ef629b047a1a3ae6c2e524e618fbf6b.tar.bz2
Merge topic 'vs-sdk-selection'
d5118ed2e5 Merge branch 'backport-vs-sdk-selection' into vs-sdk-selection 89b611ab32 VS: Select latest Windows SDK even when targeting Windows 8.1 and below ae97d82e83 VS: Teach CMAKE_GENERATOR_PLATFORM to support Windows 8.1 SDK selection 15ff89654b VS: Teach CMAKE_GENERATOR_PLATFORM to use Windows 10 SDKs for older versions bba1a23da9 VS: Consolidate Windows SDK major version selection dispatch 209973e510 VS: Do not print empty Windows SDK version when none is selected ec6dd77053 Tests: Remove redundant condition in RunCMake.GeneratorPlatform test 4776a584ad Help: Add 3.27 release note on VS default SDK selection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8697
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.cxx')
-rw-r--r--Source/cmGlobalVisualStudio10Generator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index aa8a895..0bdc3f9 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -549,7 +549,7 @@ bool cmGlobalVisualStudio10Generator::InitializePlatformWindows(cmMakefile*)
}
bool cmGlobalVisualStudio10Generator::VerifyNoGeneratorPlatformVersion(
- cmMakefile*, cm::optional<std::string>) const
+ cmMakefile*) const
{
return true;
}