Merge branch 'main' into rm_more_exec_prog

.github/workflows/ci.yml

@@ -1,14 +1,20 @@
 name: Ubuntu CI
 
-on: [push, pull_request]
+on:
+  pull_request:
+  push:
+    branches:
+      - 'ign-cmake[0-9]'
+      - 'gz-cmake[0-9]'
+      - 'main'
 
 jobs:
   jammy-ci:
     runs-on: ubuntu-latest
     name: Ubuntu Jammy CI
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Compile and test
         id: ci
         uses: gazebo-tooling/action-gz-ci@jammy

.github/workflows/triage.yml

@@ -14,4 +14,3 @@ jobs:
         with:
           project-url: https://github.com/orgs/gazebosim/projects/7
           github-token: ${{ secrets.TRIAGE_TOKEN }}
-

Changelog.md

@@ -180,6 +180,11 @@
 
 ## Gazebo CMake 2.x
 
+### Gazebo CMake 2.17.1 (2023-08-31)
+
+1. FindIgnOgre*: fix LIBRARY_DIRS and PLUGINDIR resolution when using pkgconfig
+    * [Pull request #376](https://github.com/gazebosim/gz-cmake/pull/376)
+
 ### Gazebo CMake 2.17.0 (2023-05-19)
 
 1. Use CONFIG in gz_add_benchmark to avoid Windows collisions

README.md

@@ -7,9 +7,9 @@
 
 Build | Status
 -- | --
-Ubuntu Focal | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_cmake-ci-main-focal-amd64)](https://build.osrfoundation.org/job/ignition_cmake-ci-main-focal-amd64)
-Homebrew      | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_cmake-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_cmake-ci-main-homebrew-amd64)
-Windows       | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_cmake-ci-main-windows7-amd64)](https://build.osrfoundation.org/job/ignition_cmake-ci-main-windows7-amd64)
+Ubuntu Jammy  | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_cmake-ci-main-jammy-amd64)](https://build.osrfoundation.org/job/gz_cmake-ci-main-jammy-amd64)
+Homebrew      | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_cmake-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/gz_cmake-ci-main-homebrew-amd64)
+Windows       | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_cmake-main-win)](https://build.osrfoundation.org/job/gz_cmake-main-win)
 
 # Table of Contents
 

cmake/GzFindPackage.cmake

@@ -156,8 +156,8 @@ macro(gz_find_package PACKAGE_NAME_)
 
   # Define the expected arguments
   set(options REQUIRED PRIVATE EXACT QUIET CONFIG BUILD_ONLY PKGCONFIG_IGNORE)
-  set(oneValueArgs VERSION PRETTY PURPOSE EXTRA_ARGS PKGCONFIG PKGCONFIG_LIB PKGCONFIG_VER_COMPARISON)
-  set(multiValueArgs REQUIRED_BY PRIVATE_FOR COMPONENTS OPTIONAL_COMPONENTS)
+    set(oneValueArgs VERSION PRETTY PURPOSE PKGCONFIG PKGCONFIG_LIB PKGCONFIG_VER_COMPARISON)
+    set(multiValueArgs REQUIRED_BY PRIVATE_FOR COMPONENTS OPTIONAL_COMPONENTS EXTRA_ARGS)
 
   #------------------------------------
   # Parse the arguments

cmake/GzSetCompilerFlags.cmake

@@ -77,17 +77,7 @@ endmacro()
 # Configure settings for Unix
 # Internal to gz-cmake.
 macro(_gz_setup_unix)
-
-  find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
-  if(CMAKE_UNAME)
-    exec_program(${CMAKE_UNAME} ARGS -m OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR)
-    set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR} CACHE INTERNAL
-        "processor type (i386 and x86_64)")
-    if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
-      set(GZ_ADD_fPIC_TO_LIBRARIES true)
-    endif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
-  endif(CMAKE_UNAME)
-
+  # No custom setup for Unix systems
 endmacro()
 
 #################################################

cmake/GzUtils.cmake

@@ -214,12 +214,6 @@ macro(_gz_add_library_or_component)
     add_library(${lib_name} ${sources})
   endif()
 
-  #------------------------------------
-  # Add fPIC if we are supposed to
-  if(GZ_ADD_fPIC_TO_LIBRARIES AND NOT _gz_add_library_INTERFACE)
-    target_compile_options(${lib_name} PRIVATE -fPIC)
-  endif()
-
   if(NOT _gz_add_library_INTERFACE)
 
     #------------------------------------

examples/core_child/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-core_child VERSION 0.1.0)
 find_package(gz-cmake4 REQUIRED)
 gz_configure_project()
-gz_find_package(gz-core_no_deps REQUIRED)
+gz_find_package(gz-core_no_deps REQUIRED EXTRA_ARGS NAMES gz-core_no_deps)
 gz_configure_build(QUIT_IF_BUILD_ERRORS)
 gz_create_packages()
 gz_create_docs(TAGFILES "${GZ-CORE_NO_DEPS_DOXYGEN_TAGFILE} = ${GZ-CORE_NO_DEPS_API_URL}")