Skip to content
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.

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

Fixes vs2010 doesn't recognize host=x64 #1481

Merged
merged 2 commits into from
Oct 13, 2020

Conversation

lygstate
Copy link
Contributor

This change addresses item #[[put issue number here to generate a link]]

This changes [[visible behavior/performance/documentation/etc.]]

The following changes are proposed:

The purpose of this change

Other Notes/Information

@bobbrow bobbrow added this to the 1.5.0 milestone Oct 12, 2020
if (generatorName) {
log.debug(` ${localize('generator.present', 'Generator Present: {0}', generatorName)}`);
kit.preferredGenerator = {
name: generatorName,
platform: generatorPlatformFromVSArch[targetArch] as string || targetArch,
// CMake generator toolsets support also different versions (via -T version=).
toolset: "host=" + hostArch
toolset
};
}
log.debug(` ${localize('selected.preferred.generator.name', 'Selected Preferred Generator Name: {0} {1}', generatorName, JSON.stringify(kit.preferredGenerator))}`);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about we assign toolset as:
toolset: "host=" + kitHostTargetArch(hostArch, targetArch, majorVersion < 15)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fine with that

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great. Can you test that in your setup and if all is well commit an update? I'll approve it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

toolset: "host=" + kitHostTargetArch(hostArch, targetArch, majorVersion < 15)

Why host= still here? that's should be removed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[main] 正在配置文件夹: xemu-with-lib 
[driver] 删除 e:/CI-Cor-Ready/xemu/xemu-with-lib/build-cmake/msvc_10_0_win32_x64_Debug/CMakeCache.txt
[driver] 删除 e:\CI-Cor-Ready\xemu\xemu-with-lib\build-cmake\msvc_10_0_win32_x64_Debug\CMakeFiles
[proc] 执行命令: "C:\Program Files\CMake\bin\cmake.EXE" --no-warn-unused-cli -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE -He:/CI-Cor-Ready/xemu/xemu-with-lib -Be:/CI-Cor-Ready/xemu/xemu-with-lib/build-cmake/msvc_10_0_win32_x64_Debug -G "Visual Studio 10 2010" -T host=amd64 -A x64
[cmake] Not searching for unused variables given on the command line.
[cmake] CMake Error at CMakeLists.txt:17 (project):
[cmake]   Generator
[cmake] 
[cmake]     Visual Studio 10 2010
[cmake] 
[cmake]   given toolset specification
[cmake] 
[cmake]     host=amd64
[cmake] 
[cmake]   that contains invalid field 'host=amd64'.
[cmake] 
[cmake] 
[cmake] -- Configuring incomplete, errors occurred!
[cmake] See also "E:/CI-Cor-Ready/xemu/xemu-with-lib/build-cmake/msvc_10_0_win32_x64_Debug/CMakeFiles/CMakeOutput.log".

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I thought that the problem was using amd64 versus x64, not the host attribute itself. I see now, looks good. I am approving.

2010 doesn't have x64 host compiler.
@andreeis andreeis merged commit 8a033dc into microsoft:develop Oct 13, 2020
@github-actions github-actions bot locked and limited conversation to collaborators Jan 29, 2022
@lygstate lygstate deleted the vs2010-fix branch February 8, 2022 08:40
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants