Merge pull request #500 from gazebosim/scpeters/merge_4_main

Merge gz-cmake4 ➡️  main

Author: scpeters

CMakeLists.txt

@@ -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)
 

Changelog.md

@@ -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