Skip to content

[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.

Sign up for GitHub

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
talregev wants to merge 50 commits into from
Closed

[gazebo] fix gazebo linux dependency #24969

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
2edc4ee
fix pkgconf for linux
talregev May 28, 2022
66e829c
Fix dependency ogre
May 30, 2022
aa79376
add port libtar
May 30, 2022
c4e7c38
remove unnecessary dependencies
May 30, 2022
64559fd
version
May 30, 2022
7f59993
Fix freeimage
May 30, 2022
1f2be0b
Add dependency freeimage
May 30, 2022
bf46d3b
Re-fix dependency freeimage
May 31, 2022
fd9b1d9
Add dependency simbody on non-Windows
May 31, 2022
f9d49bb
Fix dependency simbody
May 31, 2022
560c29e
Merge branch 'master' of https://github.com/microsoft/vcpkg into TalR…
Jun 17, 2022
6ce4a85
Merge branch 'master' of https://github.com/microsoft/vcpkg into TalR…
Jun 24, 2022
db22d08
Fix dependency simdbody and protobuf
Jun 29, 2022
27669ab
Fix build type
Jun 29, 2022
247eea0
Add dependency opengl for tool gazebo
Jun 29, 2022
f1fb243
Add support value !linux temporary
Jul 1, 2022
954941b
versopm
Jul 1, 2022
f1eb05e
fix pkgconf for linux
talregev Jul 7, 2022
cdc066a
Fix dependency ogre
May 30, 2022
d0cea5b
add port libtar
May 30, 2022
3e1225f
remove unnecessary dependencies
May 30, 2022
5a1341a
version
May 30, 2022
5f7ca2c
Fix freeimage
May 30, 2022
3d822c4
Add dependency freeimage
May 30, 2022
4f6e799
Re-fix dependency freeimage
May 31, 2022
1694553
Add dependency simbody on non-Windows
May 31, 2022
3f01142
Fix dependency simbody
May 31, 2022
8e3db63
Fix dependency simdbody and protobuf
Jun 29, 2022
d1bba35
Fix build type
Jun 29, 2022
2c10644
Add dependency opengl for tool gazebo
Jun 29, 2022
513c471
Add support value !linux temporary
Jul 1, 2022
5995a55
versopm
Jul 1, 2022
5f2216f
fix libtar vcpkg.json file.
talregev Jul 2, 2022
7dc9f7f
Fix gazebo version
talregev Jul 2, 2022
ca66961
fix opengl def
talregev Jul 2, 2022
6aa9b5a
Merge branch 'TalR/fix_gazebo' of https://github.com/talregev/vcpkg i…
Jul 11, 2022
f8e8342
Merge branch 'master' of https://github.com/microsoft/vcpkg into TalR…
Jul 11, 2022
487219f
Update
Jul 11, 2022
efcda83
Merge branch 'master' of https://github.com/microsoft/vcpkg into TalR…
Jul 12, 2022
30902c2
Remove supports expression
Jul 12, 2022
9c81851
Fix find dependencies using pkgconfig
Jul 13, 2022
f44ae79
fix libtar description
talregev Jul 13, 2022
38c0aa1
Fix test and plugin
Jul 14, 2022
93128d8
./vcpkg x-add-version --all --overwrite-version
talregev Jul 16, 2022
aa120cb
fix freeimage dependency
talregev Jul 16, 2022
feb8d37
revert fix freeimage dependency
talregev Jul 16, 2022
278c5f2
Add feature tools, re-generate patches, fix feature tool condition
Jul 20, 2022
fbcb869
Merge branch 'master' of https://github.com/microsoft/vcpkg into TalR…
Jul 21, 2022
489ea98
Merge branch 'master' into TalR/fix_gazebo
JackBoosY Aug 4, 2022
7f42da1
Merge branch 'master' into TalR/fix_gazebo
talregev Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/gazebo/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DUSE_EXTERNAL_TINY_PROCESS_LIBRARY=ON
-DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf.exe
-DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}
${FEATURE_OPTIONS}
-DBUILD_TESTING=OFF # Not enabled by default, but to be sure
)
Expand Down
2 changes: 1 addition & 1 deletion ports/gazebo/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "gazebo",
"version-date": "2022-01-20",
"port-version": 1,
"port-version": 2,
"description": "Open source robotics simulator.",
"homepage": "http://gazebosim.org",
"license": "Apache-2.0",
Expand Down
1 change: 0 additions & 1 deletion scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,6 @@ ftgl:x64-uwp=fail
functions-framework-cpp:x64-uwp=fail
fuzzylite:x64-osx=fail

gazebo:x64-linux=fail
# gsoap does not offer stable public source downloads
gsoap:x64-windows = skip
gsoap:x86-windows = skip
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2430,7 +2430,7 @@
},
"gazebo": {
"baseline": "2022-01-20",
"port-version": 1
"port-version": 2
},
"gcem": {
"baseline": "1.14.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/gazebo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0575eb88760d8605617cd01db94b58444afccccc",
"version-date": "2022-01-20",
"port-version": 2
},
{
"git-tree": "702a7de5c38ff156813a73a32eac6c7ca73248e4",
"version-date": "2022-01-20",
Expand Down