Skip to content

Clean up Visual Studio generator name from cmake <3.0 compatibiliy left overs #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brad-linden merged 1 commit into from
Aug 7, 2025
Merged

Clean up Visual Studio generator name from cmake <3.0 compatibiliy left overs #54

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions autobuild/autobuild_tool_source_environment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,10 +733,10 @@ def internal_source_environment(configurations, varsfile):
# vswhere might have reported (e.g.) "158" or "161". Ignore
# the minor version when choosing the CMake generator.
AUTOBUILD_WIN_CMAKE_GEN = {
'12': "Visual Studio 12",
'14': "Visual Studio 14",
'15': "Visual Studio 15",
'16': "Visual Studio 16",
'12': "Visual Studio 12 2013",
'14': "Visual Studio 14 2015",
'15': "Visual Studio 15 2017",
'16': "Visual Studio 16 2019",
'17': "Visual Studio 17 2022",
}[vsver[:-1]]
except KeyError:
Expand All @@ -747,11 +747,7 @@ def internal_source_environment(configurations, varsfile):
# error here. Plus this way, we defer the error until we hit a
# build that actually consumes AUTOBUILD_WIN_CMAKE_GEN.
AUTOBUILD_WIN_CMAKE_GEN = "Visual Studio %s" % (vsver[:-1])
# Of course CMake also needs to know bit width :-P
# Or at least it used to, until VS 2019.
if os.environ["AUTOBUILD_ADDRSIZE"] == "64" and vsver < '160':
AUTOBUILD_WIN_CMAKE_GEN += " Win64"
# cmake -G "$AUTOBUILD_WIN_CMAKE_GEN"

exports["AUTOBUILD_WIN_CMAKE_GEN"] = AUTOBUILD_WIN_CMAKE_GEN

try:
Expand Down
Loading