Skip to content

Merge gz-cmake4 ➡️ main #500

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

Merged
scpeters merged 3 commits into from
May 14, 2025
Merged

Merge gz-cmake4 ➡️ main #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7be1242
Prepare for 4.2.0 release (#495)
scpeters Apr 25, 2025
225d74b
Replace join_paths with cmake_path(APPEND) (#498)
scpeters May 5, 2025
eda5881
Merge branch 'gz-cmake4' into scpeters/merge_4_main
scpeters May 14, 2025
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
13 changes: 7 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,13 @@ file(RELATIVE_PATH
"${CMAKE_INSTALL_PREFIX}"
)

# TODO(jrivero): CMake 3.20 provides cmake_path(APPEND) which implements the
# same functionality as join_paths(). Remove JoinPaths in the next major version
# if all the supported platforms are in 3.20 version.
include(JoinPaths)
join_paths(GZ_PC_LIBDIR "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
join_paths(GZ_PC_INCLUDEDIR "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}" "${GZ_INCLUDE_INSTALL_DIR_POSTFIX}")
# Use cmake_path(APPEND) to construct path variables used in pkg-config file.
# Since the first argument to this function must be a cmake variable (not a
# string constant, initialize the variable to the first path component.
set(GZ_PC_LIBDIR "\${prefix}")
cmake_path(APPEND GZ_PC_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
set(GZ_PC_INCLUDEDIR "\${prefix}")
cmake_path(APPEND GZ_PC_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}" "${GZ_INCLUDE_INSTALL_DIR_POSTFIX}")

configure_file(${gz_pkgconfig_input} ${gz_pkgconfig_output} @ONLY)

Expand Down
17 changes: 17 additions & 0 deletions Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,23 @@

## Gazebo CMake 4.x

### Gazebo CMake 4.2.0 (2025-04-25)

1. **Baseline:** this includes all changes from 4.1.1 and earlier.

1. Doxygen: use `MARKDOWN_ID_STYLE` = GITHUB
* [Pull request #491](https://github.com/gazebosim/gz-cmake/pull/491)

1. Avoid warnings on unused `CMAKE_BUILD_TYPE` on Windows
* [Pull request #487](https://github.com/gazebosim/gz-cmake/pull/487)

1. Integrate Ogre-Next 3.x.x built from source
* [Pull request #468](https://github.com/gazebosim/gz-cmake/pull/468)

1. Reduce example names to be able to run Conda CI on Windows (gz-cmake4)
* [Pull request #476](https://github.com/gazebosim/gz-cmake/pull/476)
* [Pull request #478](https://github.com/gazebosim/gz-cmake/pull/478)

### Gazebo CMake 4.1.1 (2025-02-24)

1. Normalize header install path
Expand Down