Switch weakjack to submodule #3970
Merged
Conversation
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
tresf
commented
Nov 14, 2017
| @@ -67,6 +67,13 @@ ELSEIF(NOT ("${SDL_INCLUDE_DIR}" STREQUAL "")) | |||
| INCLUDE_DIRECTORIES("${SDL_INCLUDE_DIR}") | |||
| ENDIF() | |||
|
|
|||
| IF(LMMS_HAVE_WEAKJACK) | |||
| LIST(APPEND LMMS_SRCS "${WEAKJACK_INCLUDE_DIRS}/weak_libjack.c") | |||
There was a problem hiding this comment.
@lukas-w I wasn't really to sure where the best place for these were, so I placed them here. A second set of eyes is appreciated, but I think it's ready to merge.
Closed
|
weakjack submodule doesn't have any files matches any globs in: lmms/cmake/modules/CheckSubmodules.cmake Line 21 in 5e2c105 |
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.
Switches weakjack to submodule.
Testers needed!
The AppImage (specifically,
linuxdeployqt) was segfaulting while I was trying to test this, but it also was happening on current master, so it may be an issue with my build system.To create an AppImage:
make install && make appimageNote, this will cause a merge conflict with syncs from
stable-1.2due to d4d909c.