Merge 2.5 #14152
Closed
Merge 2.5 #14152
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
It leads to failing tests when running mixxx-test directly
Remove warning introduced in mixxxdj#13339
(fix) Tracks: copy fix Ctrl+C
Allow to build with git "showSignature = true"
Introduce a changelog entry for 2.5.1
(Hopefully) fixes mixxxdj#14071
…ing-arg-call fix: Qt6.9 QString stricter .arg matching
… MIXXX_VCPKG_ROOT
Welcome Ubuntu Plucky Puffin; Good bye Mantic Minotaur
…ROOT Fix wrong access to ENV var MIXXX_VCPKG_ROOT instead of CMake setting MIXXX_VCPKG_ROOT
daschuer
reviewed
Jan 9, 2025
| @@ -108,7 +108,7 @@ if(DEFINED MIXXX_VCPKG_ROOT) | |||
| ) | |||
| # MIXXX_VCPKG_ROOT points to our vcpkg environment | |||
There was a problem hiding this comment.
The code above needs to be:
EXISTS "{MIXXX_VCPKG_ROOT}/overlay/ports"
OR NOT EXISTS "{MIXXX_VCPKG_ROOT}/ports"
``
|
@daschuer please check the fixup. |
|
Oh, I have also deleted the $ in my suggestion. Sorry. I when ahead and merged a fix directy. |
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.
Just to let someone double-check the cmake changes.