Consider the Visual Studio path for Ninja #120
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Nov 2, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
WindowsToolchain used to download Ninja if it was specified as the CMake Generator but wasn't present on the system. That functionality was moved to WindowsCMake (to give WindowsToolchain more focused responsibilities), but #99 called out that the functionality in WindowsCMake didn't consider the Visual Studio installed version of Ninja. The responsibility of the two projects - WindowsToolchain and WindowsCMake made reconciling things difficult; WindowsToolchain is intended to be scoped and minimally sufficient, and only perform 'toolchain'-responsibilities, WindowsCMake runs 'too late' in the CMake configuration to resolve the CMAKE_MAKE_PROGRAM. This PR proposes an alternative fix - WindowsToolchain can add the location of the "Visual Studio"-installed ninja to the CMAKE_SYSTEM_PROGRAM_PATH, which CMake will consider to find the CMAKE_MAKE_PROGRAM. By appending to CMAKE_SYSTEM_PROGRAM_PATH (as opposed to, say, CMAKE_PROGRAM_PATH), the path is considered after the environment path allowing an installed ninja to be preferred.