Skip to content

Conversation

@azeey
Copy link
Contributor

@azeey azeey commented Aug 14, 2025

➡️ Forward port

Port gz-cmake4 ➡️ main

Part of gazebosim/gz-jetty#97

Branch comparison: main...gz-cmake4

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

azeey and others added 15 commits May 3, 2024 11:39
…gazebosim#427)

* Replace exec_program with execute_process (gazebosim#402)
* Remove additional exec_program

Signed-off-by: Addisu Z. Taddese <[email protected]>

---------

Signed-off-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Steve Peters <[email protected]>
* Bump version to 2.17.2

Signed-off-by: Jose Luis Rivero <[email protected]

---------

Signed-off-by: Jose Luis Rivero <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
(cherry picked from commit 916a917)
gazebosim#463)

* Finish with the massive renaming

---------
Signed-off-by: Jose Luis Rivero <[email protected]>
…im#464)

* Support for conda-forge ogre-next recipe

---------
Signed-off-by: Jose Luis Rivero <[email protected]>
The "meta" header containing a list of all includes in
the package is currently installed one folder above the
other includes. This cleans up the definition of that
install path by normalizing it to fix a cmake warning
and also renaming some variables for clarity.

Manual backport of gazebosim#467, gazebosim#474.

Signed-off-by: Steve Peters <[email protected]>
…azebosim#488)

Signed-off-by: Jose Luis Rivero <[email protected]>
(cherry picked from commit e6097c5)

Co-authored-by: Jose Luis Rivero <[email protected]>
…azebosim#490)

Signed-off-by: Jose Luis Rivero <[email protected]>
(cherry picked from commit e6097c5)

Co-authored-by: Jose Luis Rivero <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Merge ign-cmake2 ➡️  2_to_3
Signed-off-by: Addisu Z. Taddese <[email protected]>
Merge gz-cmake3 ➡️  gz-cmake4
Signed-off-by: Addisu Z. Taddese <[email protected]>
@github-project-automation github-project-automation bot moved this from Inbox to In review in Core development Aug 14, 2025
@scpeters scpeters merged commit 8420d0c into gazebosim:main Aug 14, 2025
9 checks passed
@github-project-automation github-project-automation bot moved this from In review to Done in Core development Aug 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🪵 jetty Gazebo Jetty

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants