-
Notifications
You must be signed in to change notification settings - Fork 7.4k
[gazebo] fix gazebo linux dependency #24969
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
Closed
Closed
Changes from all commits
Commits
Show all changes
50 commits
Select commit
Hold shift + click to select a range
2edc4ee
fix pkgconf for linux
talregev 66e829c
Fix dependency ogre
aa79376
add port libtar
c4e7c38
remove unnecessary dependencies
64559fd
version
7f59993
Fix freeimage
1f2be0b
Add dependency freeimage
bf46d3b
Re-fix dependency freeimage
fd9b1d9
Add dependency simbody on non-Windows
f9d49bb
Fix dependency simbody
560c29e
Merge branch 'master' of https://github.com/microsoft/vcpkg into TalR…
6ce4a85
Merge branch 'master' of https://github.com/microsoft/vcpkg into TalR…
db22d08
Fix dependency simdbody and protobuf
27669ab
Fix build type
247eea0
Add dependency opengl for tool gazebo
f1fb243
Add support value !linux temporary
954941b
versopm
f1eb05e
fix pkgconf for linux
talregev cdc066a
Fix dependency ogre
d0cea5b
add port libtar
3e1225f
remove unnecessary dependencies
5a1341a
version
5f7ca2c
Fix freeimage
3d822c4
Add dependency freeimage
4f6e799
Re-fix dependency freeimage
1694553
Add dependency simbody on non-Windows
3f01142
Fix dependency simbody
8e3db63
Fix dependency simdbody and protobuf
d1bba35
Fix build type
2c10644
Add dependency opengl for tool gazebo
513c471
Add support value !linux temporary
5995a55
versopm
5f2216f
fix libtar vcpkg.json file.
talregev 7dc9f7f
Fix gazebo version
talregev ca66961
fix opengl def
talregev 6aa9b5a
Merge branch 'TalR/fix_gazebo' of https://github.com/talregev/vcpkg i…
f8e8342
Merge branch 'master' of https://github.com/microsoft/vcpkg into TalR…
487219f
Update
efcda83
Merge branch 'master' of https://github.com/microsoft/vcpkg into TalR…
30902c2
Remove supports expression
9c81851
Fix find dependencies using pkgconfig
f44ae79
fix libtar description
talregev 38c0aa1
Fix test and plugin
93128d8
./vcpkg x-add-version --all --overwrite-version
talregev aa120cb
fix freeimage dependency
talregev feb8d37
revert fix freeimage dependency
talregev 278c5f2
Add feature tools, re-generate patches, fix feature tool condition
fbcb869
Merge branch 'master' of https://github.com/microsoft/vcpkg into TalR…
489ea98
Merge branch 'master' into TalR/fix_gazebo
JackBoosY 7f42da1
Merge branch 'master' into TalR/fix_gazebo
talregev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 3e0ae3d..eeb1ba7 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -384,16 +384,18 @@ else (build_errors) | ||
| set(TEST_TYPE "UNIT") | ||
| add_subdirectory(gazebo) | ||
| add_subdirectory(media) | ||
| + if (BUILD_TOOLS) | ||
| add_subdirectory(tools) | ||
| + endif() | ||
| + if (BUILD_PLUGINS) | ||
| add_subdirectory(plugins) | ||
| + endif() | ||
| add_subdirectory(interfaces) | ||
| add_subdirectory(worlds) | ||
| add_subdirectory(models) | ||
|
|
||
| if (BUILD_TESTING) | ||
| add_subdirectory(test) | ||
| - else() | ||
| - add_subdirectory(test EXCLUDE_FROM_ALL) | ||
| endif() | ||
|
|
||
| endif (BUILD_GAZEBO) | ||
| diff --git a/gazebo/CMakeLists.txt b/gazebo/CMakeLists.txt | ||
| index 9ad9d02..5c45753 100644 | ||
| --- a/gazebo/CMakeLists.txt | ||
| +++ b/gazebo/CMakeLists.txt | ||
| @@ -41,7 +41,9 @@ add_subdirectory(gui) | ||
| add_subdirectory(physics) | ||
| add_subdirectory(sensors) | ||
| add_subdirectory(util) | ||
| +if (BUILD_TESTING) | ||
| add_subdirectory(test) | ||
| +endif() | ||
|
|
||
| add_dependencies(gazebo_physics gazebo_msgs) | ||
| add_dependencies(gazebo_gui gazebo_msgs) |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| diff --git a/cmake/GazeboUtils.cmake b/cmake/GazeboUtils.cmake | ||
| index f1710e9..ace50f9 100644 | ||
| --- a/cmake/GazeboUtils.cmake | ||
| +++ b/cmake/GazeboUtils.cmake | ||
| @@ -146,13 +146,11 @@ endmacro () | ||
| ################################################# | ||
| macro (gz_setup_unix) | ||
| # Using dynamic linking in UNIX by default | ||
| - set(BUILD_SHARED_LIBS TRUE) | ||
| endmacro() | ||
|
|
||
| ################################################# | ||
| macro (gz_setup_windows) | ||
| # Using dynamic linking in Windows by default | ||
| - set(BUILD_SHARED_LIBS TRUE) | ||
| add_definitions(-DWIN32_LEAN_AND_MEAN) | ||
|
|
||
| # Need for M_PI constant |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/gazebo/rendering/RenderEngine.cc b/gazebo/rendering/RenderEngine.cc | ||
| index 87d78ea95d..bd90493266 100644 | ||
| --- a/gazebo/rendering/RenderEngine.cc | ||
| +++ b/gazebo/rendering/RenderEngine.cc | ||
| @@ -22,6 +22,8 @@ | ||
|
|
||
| // Not Apple or Windows | ||
| #if not defined(__APPLE__) && not defined(_WIN32) | ||
| +#define GL_GLEXT_LEGACY | ||
| +#define GLX_GLXEXT_LEGACY | ||
| # include <X11/Xlib.h> | ||
| # include <X11/Xutil.h> | ||
| # include <GL/glx.h> |
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| set(VCPKG_USE_HEAD_VERSION ON) | ||
| vcpkg_from_git( | ||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| URL https://repo.or.cz/libtar.git | ||
| HEAD_REF v1.2.20 | ||
| ) | ||
|
|
||
| vcpkg_configure_make( | ||
| SOURCE_PATH "${SOURCE_PATH}" | ||
| ) | ||
|
|
||
| vcpkg_install_make() | ||
|
|
||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") | ||
|
|
||
| file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "name": "libtar", | ||
| "version": "1.2.20", | ||
| "description": "libtar - C library for manipulating tar files", | ||
| "homepage": "https://repo.or.cz/libtar.git", | ||
| "supports": "!windows" | ||
| } |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cc @Neumann-A @dg0yt
According to the cmake doc:
Since the minimum cmake version for some ports is lower than 3.1,
CMAKE_PREFIX_PATHwill not be used asPKG_CONFIG_PATH, which will cause finding dependencies to fail.Should we always set it
ONinvcpkg_cmake_configureand vcpkg toolchain?This issue struck me twice! Total debug cost: 3 day and 1.5 hour.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I had to use it before (openscap, wxwidgets).
It probably should be in
vcpkg_cmake_configure. But it may change the behaviour of Find modules. I didn't want to open another can of worms ;-) (I guess that's why Kitware made it depend on CMake version.) And it easily becomes a transitive usage requirements for user projects.At least a port could opt out of a
vcpkg_cmake_configuredefault by passing the opposite OPTION.