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

[master] Enable Windows build. #33

Merged
merged 2 commits into from
Jan 10, 2020
Merged

[master] Enable Windows build. #33

merged 2 commits into from
Jan 10, 2020

Conversation

seanyen
Copy link
Contributor

@seanyen seanyen commented Dec 13, 2019

This pull request is attempting to enable Windows build. This is verified against https://aka.ms/ros project.

  • Dropped wildcard usage for CMake -E copy since it is not really supported and not portable.

  • Dropped ${CMAKE_SOURCE_DIR} from link_directories to make the CMakeLists.txt more relocatable.

  • Explicitly un-define WIN32_LEAN_AND_MEAN, which is defined in catkin for Windows build to avoid large namespace pollution. However, for SOEM, that makes many symbols (for example, timeBeginPeriod, malloc, and free) invisible from Windows header, but which is required by source files (E.g., osal.c and oshw.c).

@seanyen
Copy link
Contributor Author

seanyen commented Dec 13, 2019

cc @mgruhler This is ready for review. Thanks!

Copy link
Collaborator

@mgruhler mgruhler left a comment

Choose a reason for hiding this comment

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

Thanks for this contribution @seanyen

I don't have any ROS Windows setup, so I cannot test any of this. But I'd be fine with merging if the ROS debian pkgs still behave the same.
I'll try to test this some time next week, but no guarantees ;-)

CMakeLists.txt Show resolved Hide resolved
SOEM/CMakeLists.txt Show resolved Hide resolved
@mgruhler
Copy link
Collaborator

@seanyen I've just tested your changes and all seem fine. As discussed, I'll merge this now.

Do you require a release or are your fine using this from source atm?

@mgruhler mgruhler merged commit 6e2c72c into orocos:master Jan 10, 2020
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

2 participants