dynamically link libraries #2004
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
Removed libusbx from project and now require libusb-1.0 to be installed as a dependency. Required `apt-get install libusb-1.0-0-dev`
Fix compilation error for build dbus and removes the dbus library from the core project. Dbus is still supported but now Core will not install it on the users system.
Jack-Byrne
changed the title
jacobkeeler
requested changes
Feb 2, 2018
src/3rd_party/CMakeLists.txt
Outdated
|
|
||
| if(NO_REBUILD_3RD_PARTY) | ||
| set(NO_REBUILD_3RD_PARTY_LOGGER ON) | ||
| set(NO_REBUILD_3RD_PARTY_DBUS ON) | ||
|
|
Contributor
There was a problem hiding this comment.
Unnecessary whitespace.
| @@ -272,7 +274,7 @@ bool LifeCycle::InitMessageSystem() { | |||
| bool LifeCycle::InitMessageSystem() { | |||
| dbus_adapter_ = new hmi_message_handler::DBusMessageAdapter(hmi_handler_); | |||
|
|
|||
| hmi_handler_.AddHMIMessageAdapter(dbus_adapter_); | |||
| hmi_handler_->AddHMIMessageAdapter(dbus_adapter_); | |||
Contributor
There was a problem hiding this comment.
How did this ever work?
| @@ -57,7 +57,7 @@ void GetVehicleDataRequest::Run() { | |||
|
|
|||
| int32_t app_id = | |||
| (*message_)[strings::params][strings::connection_key].asUInt(); | |||
| ApplicationSharedPtr app = appplication_manager.application(app_id); | |||
| ApplicationSharedPtr app = application_manager_.application(app_id); | |||
Contributor
There was a problem hiding this comment.
How did this ever work?
src/components/dbus/CMakeLists.txt
Outdated
| @@ -40,19 +40,19 @@ include_directories ( | |||
| ${COMPONENTS_DIR}/utils/include/ | |||
| ${CMAKE_BINARY_DIR}/src/components/ | |||
| ) | |||
|
|
|||
| message(${CMAKE_CURRENT_SOURCE_DIR}) | |||
Contributor
There was a problem hiding this comment.
Debug message, should be removed.
jacobkeeler
approved these changes
Feb 2, 2018
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.
Summary
Remove Libusbx and Dbus from the source code and dynamically link the libraries instead of statically linking.
CLA