Fix Windows build when using vcpkg #3132
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
|
sorry I just introduced some conflicts by merging #3138. do you mind resolving them? |
|
actually let me try |
scpeters
reviewed
Dec 2, 2021
scpeters
reviewed
Dec 2, 2021
cmake/GazeboUtils.cmake
Outdated
| @@ -181,7 +181,7 @@ macro (gz_setup_windows) | |||
| endif() | |||
|
|
|||
| if (MSVC) | |||
| add_compile_options(/Zc:__cplusplus) | |||
| add_compile_options(/Zc:__cplusplus /permissive- /Zc:strictStrings-) | |||
There was a problem hiding this comment.
the windows CI build is broken; I'm guessing it's related to this change?
[ 43%] Building CXX object gazebo/transport/CMakeFiles/gazebo_transport.dir/IOManager.cc.obj
C:\Jenkins\workspace\gazebo-ci-pr_any-windows7-amd64\ws\install\include\boost/interprocess/detail/win32_api.hpp(892): error C2116: 'GetProcessTimes': function parameter lists do not match between declarations
C:\Program Files (x86)\Windows Kits\10\include\10.0.19041.0\um\processthreadsapi.h(106): note: see declaration of 'GetProcessTimes'
C:\Jenkins\workspace\gazebo-ci-pr_any-windows7-amd64\ws\install\include\boost/interprocess/detail/win32_api.hpp(892): error C2733: 'GetProcessTimes': you cannot overload a function with 'extern "C"' linkage
C:\Program Files (x86)\Windows Kits\10\include\10.0.19041.0\um\processthreadsapi.h(106): note: see declaration of 'GetProcessTimes'
C:\Jenkins\workspace\gazebo-ci-pr_any-windows7-amd64\ws\install\include\boost/interprocess/detail/win32_api.hpp(908): error C2371: 'GetFileType': redefinition; different basic types
C:\Program Files (x86)\Windows Kits\10\include\10.0.19041.0\um\fileapi.h(708): note: see declaration of 'GetFileType'
C:\Jenkins\workspace\gazebo-ci-pr_any-windows7-amd64\ws\install\include\boost/interprocess/detail/win32_api.hpp(908): error C2733: 'GetFileType': you cannot overload a function with 'extern "C"' linkage
...
There was a problem hiding this comment.
I pushed a change. Hopefully that should fix it.
There was a problem hiding this comment.
There are test failures, but those seem to have been happening for a while. Both tests seem to fail because they are using command not available on Windows cmd (make and rm). Would it be worth modifying them or removing them?
|
looks ok to me. What do you think @traversaro ? |
Ok for me! |
traversaro
approved these changes
Dec 11, 2021
scpeters
approved these changes
Dec 14, 2021
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.
Here are a list of changes I had to make to get Gazebo building on Windows when using vcpkg for dependencies:
TO_NATIVE_PATHfor the default system paths forGAZEBO_PLUGIN_PATH,GAZEBO_MODEL_PATH, andGAZEBO_RESOURCE_PATHuses\for the path separation characters without escaping and although escaping isn't required in CMake, it needs to be escaped in the C++ code. Therefore, I changed it toTO_CMAKE_PATHso the path separation character is always/./permissive-is needed to fix a dart error as described here/Zc:strictStrings-is needed in order to assign achar*with a string inode/misc.hDIFFERENCEis a macro defined by a Windows header and needs to be undefed in order to be used in MeshCSG.hh