cmake libuci dependency improvement
#144
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
Moves common iface depencies out of the `if()` statements
Previously, this did not exist, which could cause issues when building in parallel
subscriber_events was missing a dependency on supervisor_config. As subscriber_event's dependency on iface was through supervisor_config, this meant that we could remove it too.
A bunch of difference cmake targets had incorrect dependencies on iface. For example, they should be dependending on supervisor_config, which then dependends on iface.
Compiles libuci in the `cmake --build` compile step, instead of compiling during the `cmake` configure step, using ExternalProject.
Compiles `libubox` in the `cmake --build` compile step, instead of compiling during the `cmake` configure step, using ExternalProject.
When compiling using the OpenWRT SDK, libuci is already installed, so there's no need to compile it manually.
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.
Two changes:
ucianduboxis now built at compile time usingExternalProject.This allows
make -j4to build it with multiprocessing, and makescmakea lot faster, since the hard work is now duringcmake --build.-DBUILD_UCI_LIB=OFFnow works.This will make UCI/UBOX compiliation optional, and should hopefully mean that EDGESec now compiles correctly with the OpenWRT SDK.