[portmidi] Add non-Windows support, refactory install process#19710
Merged
BillyONeal merged 16 commits intomicrosoft:masterfrom Sep 17, 2021
Merged
[portmidi] Add non-Windows support, refactory install process#19710BillyONeal merged 16 commits intomicrosoft:masterfrom
BillyONeal merged 16 commits intomicrosoft:masterfrom
Conversation
added 2 commits
August 23, 2021 03:40
added 2 commits
August 23, 2021 03:52
added 2 commits
August 23, 2021 23:45
added 2 commits
August 23, 2021 23:49
JackBoosY
commented
Aug 27, 2021
| LIBRARY DESTINATION lib | ||
| ARCHIVE DESTINATION lib) | ||
| + if (JAVA_SUPPORT) | ||
| + INSTALL(TARGETS pmjni |
Contributor
Author
There was a problem hiding this comment.
This target pmjni requires java executable on local machine, so I disabled it.
In source/portmidi/trunk/pm_java/CMakeLists.txt:
add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class
COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java
MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java
DEPENDS pmdefaults/PmDefaults.java
WORKING_DIRECTORY .)
add_custom_command(OUTPUT pmdefaults/PmDefaults.class
COMMAND javac -classpath . pmdefaults/PmDefaults.java
MAIN_DEPENDENCY pmdefaults/PmDefaults.java
DEPENDS pmdefaults/PmDefaultsFrame.java
WORKING_DIRECTORY .)
PhoebeHui
approved these changes
Aug 27, 2021
Contributor
|
Nice work, would be great to get this in. Is #19366 redundant due to this PR? |
# Conflicts: # ports/portmidi/portfile.cmake # ports/portmidi/vcpkg.json # versions/p-/portmidi.json
BillyONeal
reviewed
Sep 2, 2021
BillyONeal
requested changes
Sep 2, 2021
Member
BillyONeal
left a comment
There was a problem hiding this comment.
The DLL change seems incorrect
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 2d8e2a8a475895577517392d74f1b7b1ecfc832d -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/p-/portmidi.json b/versions/p-/portmidi.json
index 479e178..1205e03 100644
--- a/versions/p-/portmidi.json
+++ b/versions/p-/portmidi.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "6b1a65f29feed5c59672bf0772f2a29edc7e2d02",
+ "git-tree": "70a85d5a9ddc162df4c7296caf7ac8633089d50c",
"version-string": "0.234",
"port-version": 2
},
JackBoosY
commented
Sep 3, 2021
Contributor
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
PhoebeHui
approved these changes
Sep 17, 2021
Member
|
Thanks for your fix! |
This file contains hidden or 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
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.
This PR will:
USE_DLLto the target (the upstream leave it in the header but didn't use it).Fixes #19694.