Skip to content

WIP [vcpkg] Fix CMAKE_SYSTEM_PROCESSOR with UWP and Linux triplets#4688

Merged
ras0219-msft merged 3 commits intomicrosoft:masterfrom
UnaNancyOwen:add_system_processor
Nov 20, 2018
Merged

WIP [vcpkg] Fix CMAKE_SYSTEM_PROCESSOR with UWP and Linux triplets#4688
ras0219-msft merged 3 commits intomicrosoft:masterfrom
UnaNancyOwen:add_system_processor

Conversation

@UnaNancyOwen
Copy link
Contributor

@UnaNancyOwen UnaNancyOwen commented Nov 9, 2018

In case of UWP and Linux triplets, CMAKE_SYSTEM_PROCESSOR is not specified. It is empty.
For details this problems, Please refer to this comment #4635 (comment).
This pull request will set CMAKE_SYSTEM_PROCESSOR under UWP and Linux triplets.
If you want to explicitly specified CPU arcitecture, You can use VCPKG_CMAKE_SYSTEM_PROCESSOR in triplet files.

@UnaNancyOwen UnaNancyOwen changed the title [vcpkg] Fix CMAKE_SYSTEM_PROCESSOR with UWP triplets [vcpkg] Fix CMAKE_SYSTEM_PROCESSOR with UWP, Linux, and Darwin triplets Nov 9, 2018
@UnaNancyOwen UnaNancyOwen changed the title [vcpkg] Fix CMAKE_SYSTEM_PROCESSOR with UWP, Linux, and Darwin triplets [vcpkg] Fix CMAKE_SYSTEM_PROCESSOR with UWP and Linux triplets Nov 9, 2018
@UnaNancyOwen UnaNancyOwen changed the title [vcpkg] Fix CMAKE_SYSTEM_PROCESSOR with UWP and Linux triplets WIP [vcpkg] Fix CMAKE_SYSTEM_PROCESSOR with UWP and Linux triplets Nov 9, 2018
Add CMAKE_SYSTEM_PROCESSOR setting under UWP, Linux, and Darwin.
If explicitly specified VCPKG_CMAKE_SYSTEM_PROCESSOR in triplet files, CMAKE_SYSTEM_PROCESSOR is set to specified architecture.
@UnaNancyOwen
Copy link
Contributor Author

@alexkaratarakis @ras0219-msft Can I get your opinion?

@ras0219-msft
Copy link
Contributor

Thanks for the investigation and the PR!

I tried to move as much "logic" as possible into the toolchains themselves and kept only the toolchain agnostic pieces in the main configure command. Note that Linux and Windows actually have different settings for CMAKE_SYSTEM_PROCESSOR (x86_64 vs AMD64).

@ras0219-msft ras0219-msft merged commit 83af530 into microsoft:master Nov 20, 2018
ras0219-msft added a commit that referenced this pull request Nov 21, 2018
@ras0219-msft
Copy link
Contributor

Ok, this unfortunately resulted in some regressions after merging; I've temporarily reverted the PR but I'll investigate and let you know what I discover.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants