Merge pull request #428 from gazebosim/scpeters/merge_3_main

Merge gz-cmake3 ➡️ main
gazebosim · May 6, 2024 · 78947cf · 78947cf
2 parents 35fdc77 + 402a777
commit 78947cf
Show file tree

Hide file tree

Showing 12 changed files with 105 additions and 11 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,4 +1,4 @@
 # More info:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 
-*      @mxgrey @j-rivero @scpeters
+*      @j-rivero @scpeters
diff --git a/.github/workflows/package_xml.yml b/.github/workflows/package_xml.yml
@@ -0,0 +1,11 @@
+name: Validate package.xml
+
+on:
+  pull_request:
+
+jobs:
+  package-xml:
+    runs-on: ubuntu-latest
+    name: Validate package.xml
+    steps:
+      - uses: gazebo-tooling/action-gz-ci/validate_package_xml@jammy
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,17 +36,20 @@ add_subdirectory(doc)
 #--------------------------------------
 # Install the benchmark files
 install(DIRECTORY benchmark/
-        DESTINATION ${GZ_DATA_INSTALL_DIR}/benchmark)
+        DESTINATION ${GZ_DATA_INSTALL_DIR}/benchmark
+        USE_SOURCE_PERMISSIONS)
 
 #--------------------------------------
 # Install the codecheck files
 install(DIRECTORY codecheck/
-        DESTINATION ${GZ_DATA_INSTALL_DIR}/codecheck)
+        DESTINATION ${GZ_DATA_INSTALL_DIR}/codecheck
+        USE_SOURCE_PERMISSIONS)
 
 #--------------------------------------
 # Install the tools files
 install(DIRECTORY tools/
-        DESTINATION ${GZ_DATA_INSTALL_DIR}/tools)
+        DESTINATION ${GZ_DATA_INSTALL_DIR}/tools
+        USE_SOURCE_PERMISSIONS)
 
 #============================================================================
 # Configure the package to be installed

diff --git a/Changelog.md b/Changelog.md
@@ -4,6 +4,62 @@
 
 ## Gazebo CMake 3.x
 
+### Gazebo CMake 3.5.3 (2024-05-02)
+
+1. Fix installation of Ign*.cmake modules on newer versions of CMake
+    * [Pull request #425](https://github.com/gazebosim/gz-cmake/pull/425)
+
+1. Add package.xml
+    * [Pull request #413](https://github.com/gazebosim/gz-cmake/pull/413)
+
+1. Remove example_INSTALL_DIR from PREFIX_PATH on examples
+    * [Pull request #421](https://github.com/gazebosim/gz-cmake/pull/421)
+
+### Gazebo CMake 3.5.2 (2024-04-05)
+
+1. Use relative install paths for extra cmake files
+    * [Pull request #422](https://github.com/gazebosim/gz-cmake/pull/422)
+
+### Gazebo CMake 3.5.1 (2024-03-29)
+
+1. Fix how `ign` compatibility files are copied in windows
+    * [Pull request #419](https://github.com/gazebosim/gz-cmake/pull/419)
+
+### Gazebo CMake 3.5.0 (2024-03-14)
+
+1. Remove @mxgrey as codeowner and assign maintainership to @scpeters
+    * [Pull request #414](https://github.com/gazebosim/gz-cmake/pull/414)
+
+1. Replace `exec_program` with `execute_process`
+    * [Pull request #402](https://github.com/gazebosim/gz-cmake/pull/402)
+
+1. cppcheck uses c++17
+    * [Pull request #404](https://github.com/gazebosim/gz-cmake/pull/404)
+
+1. Preserve executable permissions when installing scripts
+    * [Pull request #407](https://github.com/gazebosim/gz-cmake/pull/407)
+
+1. Use a consistent Python interpreter in all scripts
+    * [Pull request #406](https://github.com/gazebosim/gz-cmake/pull/406)
+
+1. Drop shebang from `upload_doc.sh`
+    * [Pull request #408](https://github.com/gazebosim/gz-cmake/pull/408)
+
+1. Use a relative symlink for `Ign*` cmake modules
+    * [Pull request #405](https://github.com/gazebosim/gz-cmake/pull/405)
+
+1. Remove exec_program call
+    * [Pull request #399](https://github.com/gazebosim/gz-cmake/pull/399)
+
+1. Update CI badges in README
+    * [Pull request #398](https://github.com/gazebosim/gz-cmake/pull/398)
+
+1. Infrastructure
+    * [Pull request #395](https://github.com/gazebosim/gz-cmake/pull/395)
+
+1. Change `EXTRA_ARGS` to be a `multiValueArgs` in `GzFindPackage`
+    * [Pull request #393](https://github.com/gazebosim/gz-cmake/pull/393)
+
 ### Gazebo CMake 3.4.1 (2023-09-26)
 
 1. Fixed finding Ogre2 on Windows+Conda

diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # Gazebo CMake : CMake Modules for Gazebo Projects
 
+**Maintainer:** scpeters AT openrobotics.org
+
 [![GitHub open issues](https://img.shields.io/github/issues-raw/gazebosim/gz-cmake.svg)](https://github.com/gazebosim/gz-cmake/issues)
 [![GitHub open pull requests](https://img.shields.io/github/issues-pr-raw/gazebosim/gz-cmake.svg)](https://github.com/gazebosim/gz-cmake/pulls)
 [![Discourse topics](https://img.shields.io/discourse/https/community.gazebosim.org/topics.svg)](https://community.gazebosim.org)

diff --git a/cmake/GzCodeCheck.cmake b/cmake/GzCodeCheck.cmake
@@ -17,7 +17,7 @@ function(_gz_setup_target_for_codecheck)
   endif()
 
   # Base set of cppcheck option
-  set (CPPCHECK_BASE -q --inline-suppr -j 4 --language=c++ --std=c++14 --force)
+  set (CPPCHECK_BASE -q --inline-suppr -j 4 --language=c++ --std=c++17 --force)
   if (EXISTS "${PROJECT_BINARY_DIR}/cppcheck.suppress")
     set (CPPCHECK_BASE ${CPPCHECK_BASE} --suppressions-list=${PROJECT_BINARY_DIR}/cppcheck.suppress)
   endif()

diff --git a/cmake/GzConfigureProject.cmake b/cmake/GzConfigureProject.cmake
@@ -30,6 +30,7 @@
 #   GZ_DESIGNATION_LOWER
 #   GZ_DESIGNATION_UPPER
 #   PKG_NAME
+#   PROJECT_CMAKE_EXTRAS_RELATIVE_INSTALL_DIR
 #   PROJECT_CMAKE_EXTRAS_INSTALL_DIR
 #   PROJECT_CMAKE_EXTRAS_PATH_TO_PREFIX
 #   PROJECT_INCLUDE_DIR
@@ -161,6 +162,7 @@ macro(gz_configure_project)
   #============================================================================
   # Configure and install cmake extras files
   # Do this after _gz_setup_packages() to ensure GNUInstallDirs has been called
+  set(PROJECT_CMAKE_EXTRAS_RELATIVE_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
   set(PROJECT_CMAKE_EXTRAS_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME})
   file(RELATIVE_PATH
     PROJECT_CMAKE_EXTRAS_PATH_TO_PREFIX
@@ -195,7 +197,7 @@ macro(gz_configure_project)
     if(is_cmake)
       install(FILES
         ${extra}
-        DESTINATION ${PROJECT_CMAKE_EXTRAS_INSTALL_DIR}
+        DESTINATION ${PROJECT_CMAKE_EXTRAS_RELATIVE_INSTALL_DIR}
       )
       get_filename_component(extra_filename "${extra}" NAME)
       list(APPEND PACKAGE_CONFIG_EXTRA_FILES "${extra_filename}")

diff --git a/cmake/upload_doc.sh.in b/cmake/upload_doc.sh.in
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 echo "Usage: sh upload_doc.sh [y/n]"
 echo "  Optional [y/n] argument indicates whether to upload the docs to S3 automatically."
 

diff --git a/codecheck/cpplint.py b/codecheck/cpplint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2009 Google Inc. All rights reserved.
 #

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -88,7 +88,7 @@ foreach(example ${example_directories})
       # See alternate approach in a2113e0997c9 if this becomes too slow
       BUILD_ALWAYS 1
       CMAKE_ARGS
-        "-DCMAKE_PREFIX_PATH=${FAKE_INSTALL_PREFIX};${example_INSTALL_DIR}"
+        "-DCMAKE_PREFIX_PATH=${FAKE_INSTALL_PREFIX}"
         "-DCMAKE_BUILD_TYPE=${build_type}"
         "-DCMAKE_INSTALL_PREFIX=${example_INSTALL_DIR}"
       TEST_COMMAND

diff --git a/package.xml b/package.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="2">
+  <name>gz-cmake4</name>
+  <version>4.0.0</version>
+  <description>Gazebo CMake : CMake Modules for Gazebo Projects</description>
+
+  <maintainer email="[email protected]">Steve Peters</maintainer>
+
+  <license>Apache License 2.0</license>
+
+  <url type="website">https://github.com/gazebosim/gz-cmake</url>
+
+  <buildtool_depend>cmake</buildtool_depend>
+  <buildtool_depend>pkg-config</buildtool_depend>
+
+  <test_depend>cmake</test_depend>
+
+  <export>
+    <build_type>cmake</build_type>
+  </export>
+</package>
diff --git a/tools/check_test_ran.py b/tools/check_test_ran.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Software License Agreement (BSD License)
 #
 # Copyright (c) 2008, Willow Garage, Inc.