feat: Add CMakeCache.txt detection to CMake module #1795
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
cschlosser
changed the title
andytom
reviewed
Oct 17, 2020
There was a problem hiding this comment.
I've left a few suggestions to fix the changes can you also update the config docs to match these changes.
src/modules/cmake.rs
Outdated
| @@ -77,7 +77,17 @@ mod tests { | |||
| let dir = tempfile::tempdir()?; | |||
| File::create(dir.path().join("CMakeLists.txt"))?.sync_all()?; | |||
| let actual = ModuleRenderer::new("cmake").path(dir.path()).collect(); | |||
| let expected = Some(format!("via {} ", Color::Blue.bold().paint("喝 v3.17.3"))); | |||
| let expected = Some(format!("via {} ", Color::Blue.bold().paint("喝 v3.17.3"))); | |||
There was a problem hiding this comment.
Not sure what has happened here but it looks like the symbol used here has changed and that is why the tests are failing.
Suggested change
| let expected = Some(format!("via {} ", Color::Blue.bold().paint("喝 v3.17.3"))); | |
| let expected = Some(format!("via {} ", Color::Blue.bold().paint("喝 v3.17.3"))); |
src/modules/cmake.rs
Outdated
| let dir = tempfile::tempdir()?; | ||
| File::create(dir.path().join("CMakeCache.txt"))?.sync_all()?; | ||
| let actual = ModuleRenderer::new("cmake").path(dir.path()).collect(); | ||
| let expected = Some(format!("via {} ", Color::Blue.bold().paint("喝 v3.17.3"))); |
There was a problem hiding this comment.
As above
Suggested change
| let expected = Some(format!("via {} ", Color::Blue.bold().paint("喝 v3.17.3"))); | |
| let expected = Some(format!("via {} ", Color::Blue.bold().paint("喝 v3.17.3"))); |
|
Thanks for taking a look at it and figuring this out. I will update the docs once the tests are working. |
andytom
reviewed
Oct 24, 2020
andytom
approved these changes
Oct 25, 2020
|
Thanks for your contribution @cschlosser |
chipbuster
pushed a commit
to chipbuster/starship
that referenced
this pull request
Jan 14, 2021
) * Add CMakeCache.txt to cmake module * Remove trailing whitespace * Apply fixes by @andytom * Add CMakeCache.txt to docs * Revert documentation for languages other than en
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.
Description
For CMake it also makes sense to check if we're currently in the build folder.
This is done by checking for the existence of
CMakeCache.txt.Motivation and Context
Now it also marks a
buildfolder asCMakerelated.This is actually where must users will spend most of their time as it's the location where the actual build system is called.
Screenshots (if appropriate):
How Has This Been Tested?
Checklist: