[gazebo] fix gazebo linux dependency #24969
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,14 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 4456aa5..4ed061f 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -385,7 +385,9 @@ else (build_errors) | ||
| add_subdirectory(gazebo) | ||
| add_subdirectory(media) | ||
| add_subdirectory(tools) | ||
| + if (BUILD_PLUGINS) | ||
| add_subdirectory(plugins) | ||
| + endif() | ||
| add_subdirectory(interfaces) | ||
| add_subdirectory(worlds) | ||
| add_subdirectory(models) | ||
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,27 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 3e0ae3d..4456aa5 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -392,8 +392,6 @@ else (build_errors) | ||
|
|
||
| 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,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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,22 @@ | ||
| vcpkg_from_github( | ||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| REPO osrf/gazebo | ||
| REF gazebo11_11.11.0 | ||
| SHA512 0f625f71ce9c6a875ac4d694cc767735243ed20922282fb1f0ef614ddeadf35e8e08e1d8484f9dbf3c873259fae93b550742deab7954c00b055890bad2b22dff | ||
| PATCHES | ||
| 0001-Fix-deps.patch | ||
| fix-build-type.patch | ||
| fix-opengl-def.patch | ||
| fix-feature-test.patch | ||
| add-feature-plugins.patch | ||
| ) | ||
|
|
||
| vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS | ||
| FEATURES | ||
| openal HAVE_OPENAL | ||
| ffmpeg FFMPEG_FEATURE | ||
| gts GTS_FEATURE | ||
| plugins BUILD_PLUGINS | ||
| INVERTED_FEATURES | ||
| simbody CMAKE_DISABLE_FIND_PACKAGE_Simbody | ||
| dart CMAKE_DISABLE_FIND_PACKAGE_DART | ||
|
|
@@ -32,9 +29,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS | |
| vcpkg_cmake_configure( | ||
| SOURCE_PATH "${SOURCE_PATH}" | ||
| OPTIONS | ||
| ${FEATURE_OPTIONS} | ||
| -DUSE_EXTERNAL_TINY_PROCESS_LIBRARY=ON | ||
| "-DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}" | ||
| -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON | ||
|
Contributor
There was a problem hiding this comment. cc @Neumann-A @dg0yt Since the minimum cmake version for some ports is lower than 3.1, This issue struck me twice! Total debug cost: 3 day and 1.5 hour.
Contributor
There was a problem hiding this comment. I had to use it before (openscap, wxwidgets). At least a port could opt out of a |
||
| -DBUILD_TESTING=OFF # Not enabled by default, but to be sure | ||
| ) | ||
|
|
||
|
|
||
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.
Some plugins are always built dynamic, so I have to add a feature to disable them when building non-windows static.