Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow DroneCore to be added to built by a parent cmake project #419

Merged
merged 5 commits into from
Jun 11, 2018

Conversation

Stifael
Copy link
Contributor

@Stifael Stifael commented Jun 6, 2018

This allows DroneCore to be added to any cmake project just by doing:

add_subdirectory(path/to/dronecore)

@julianoes julianoes changed the title cmake directory fix Allow DroneCore to be added to built by a parent cmake project Jun 6, 2018
@julianoes julianoes requested a review from JonasVautherin June 6, 2018 11:18
Copy link
Collaborator

@julianoes julianoes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thx. A couple of fixes needed.

${PROJECT_SOURCE_DIR}/core/global_include_test.cpp
${PROJECT_SOURCE_DIR}/core/mavlink_channels_test.cpp
${PROJECT_SOURCE_DIR}/core/unittests_main.cpp
# TODO: add this again
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please delete the trailing white space.

${CMAKE_SOURCE_DIR}/core
SYSTEM ${CMAKE_SOURCE_DIR}/third_party/include
#${CMAKE_CURRENT_SOURCE_DIR}/core
#SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/include
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix the accidental # changes here.

@Stifael Stifael changed the title Allow DroneCore to be added to built by a parent cmake project [WIP] Allow DroneCore to be added to built by a parent cmake project Jun 6, 2018
@JonasVautherin
Copy link
Collaborator

Thanks! Why is it a [WIP]? Can't we merge it?

@Stifael Stifael changed the title [WIP] Allow DroneCore to be added to built by a parent cmake project Allow DroneCore to be added to built by a parent cmake project Jun 6, 2018
@Stifael
Copy link
Contributor Author

Stifael commented Jun 6, 2018

Why is it a [WIP]? Can't we merge it?

Additional missing replacements. Should be ok now

@julianoes
Copy link
Collaborator

@JonasVautherin oh looks like Jenkins forgot how to do clang-format.

@julianoes
Copy link
Collaborator

Waiting with merging until we figure the Jenkinsbuild out in #420.

@julianoes
Copy link
Collaborator

@Stifael please rebase, CI should be fixed.

@Stifael Stifael force-pushed the cmake_directory_fix branch from 08a953a to 649c394 Compare June 7, 2018 11:42
@julianoes julianoes merged commit d73603e into mavlink:develop Jun 11, 2018
rt-2pm2 pushed a commit to rt-2pm2/DronecodeSDK that referenced this pull request Nov 27, 2018
Allow DroneCore to be added to built by a parent cmake project
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants