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

Fixes OS X issues when attempting to build #55

Merged
merged 6 commits into from
Feb 26, 2017

Conversation

8W9aG
Copy link
Contributor

@8W9aG 8W9aG commented Feb 26, 2017

This PR fixes various issues encountered when attempting to build AirSim for OS X, and borrows some ideas from this PR: #16

  • Fixes cmake syntax issues
  • Fixes commands being used to copy files around (and defining the target from an invalid place according to cmake)
  • Links to rpclib from the cmake project
  • Fixes various issues in MavLinkCom not compiling sources or using the wrong arguments in the Utils.cpp

@msftclas
Copy link

@8W9aG,
Thanks for having already signed the Contribution License Agreement. Your agreement was validated by Microsoft. We will now review your pull request.
Thanks,
Microsoft Pull Request Bot

* Cmake does not let you define a target without
this outside of the folders scope
* Link directly to the rpclib created by the rpclib
submodule
* RPC headers no longer live in this package
* Going to make this a no-op for now, the only way
to go around this might be using NSThread
* The format argument doesn’t exist and will break
UNIX builds
* MavLinkCom fails to link because this isn’t
compiled
@8W9aG 8W9aG mentioned this pull request Feb 26, 2017
@lovettchris lovettchris merged commit ee9a479 into microsoft:master Feb 26, 2017
@lovettchris
Copy link
Member

Nice fixes, thanks.

@lovettchris
Copy link
Member

I had to make some fixes to get Linux build to work, please test to make sure I didn't break anything in the OSX build. Specifically, I moved the EXECUTABLE_OUTPUT_PATH so all binaries are now in cmake/output/bin, and I now include CommonSetup() in the top level CmakeLists.txt so that AIRSIM_ROOT is defined.

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.

None yet

3 participants