Add JUCE_MODULES_PATH config variable #97
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 reverts commit b6e5337.
Debian have a distro package juce-modules-source that they can build against, but they need to be able to point us there. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925755
ferdnyc
added
the
build
|
Merging, in the hopes of moving things forward on a Debian package upgrade. (They're still packaging OpenShot 2.4.3!) |
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.
(See Debian bug 925755 for background.)
Debian have a distro package
juce-modules-sourcethat they can build against, but they need to be able to point us there. This PR adds aJUCE_MODULES_PATHcache variable, default to${CMAKE_CURRENT_BINARY_DIR}/JuceLibraryCode/modules, that can be overridden at build system generation time via:Tha'll allow Debian to build against their version of JUCE, instead of our bundled one.
I also reverted the old
isfinite()fix patch, so that we're using an unpatched version of JUCE, since they'll be doing the same. I figured out how to fix theisfinite()thing from the libopenshot build configs end, and a corresponding PR there will ensure that this still works.Bumped the libopenshot-audio version to
0.2.0-dev3because of the build system changes.