From aa8438abd2d51cf316dc9e0ed7390551ba19a9a9 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Fri, 7 Jul 2023 18:09:43 -0700 Subject: [PATCH 1/2] GzConfigureProject: document CONFIG_EXTRAS Also add CONFIG_EXTRAS to deprecated ign_ macro. Signed-off-by: Steve Peters --- cmake/GzConfigureProject.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake/GzConfigureProject.cmake b/cmake/GzConfigureProject.cmake index 6ed98ae2..5b2e893b 100644 --- a/cmake/GzConfigureProject.cmake +++ b/cmake/GzConfigureProject.cmake @@ -2,10 +2,16 @@ # GzConfigureProject # ------------------- # -# gz_configure_project([VERSION_SUFFIX ]) +# gz_configure_project([NO_PROJECT_PREFIX] +# [REPLACE_INCLUDE_PATH ] +# [CONFIG_EXTRAS ] +# [VERSION_SUFFIX ]) # # Sets up a Gazebo library project. # +# CONFIG_EXTRAS: Optional. If provided, the list that follows should indicate +# extra cmake template files that will be configured and installed to the +# same folder as the cmake configuration files for the core library target. # NO_PROJECT_PREFIX: Optional. Don't use gz- as prefix in # cmake project name. # REPLACE_INCLUDE_PATH: Optional. Specify include folder @@ -35,7 +41,7 @@ macro(ign_configure_project) set(options NO_PROJECT_PREFIX NO_IGNITION_PREFIX) # TODO(CH3): NO_IGNITION_PREFIX IS DEPRECATED. set(oneValueArgs REPLACE_INCLUDE_PATH REPLACE_IGNITION_INCLUDE_PATH VERSION_SUFFIX) # TODO(CH3): REPLACE_IGNITION_INCLUDE_PATH IS DEPRECATED. - set(multiValueArgs) # We are not using multiValueArgs yet + set(multiValueArgs CONFIG_EXTRAS) _gz_cmake_parse_arguments(gz_configure_project "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) set(gz_configure_project_skip_parsing true) From 2d88a77d5bcdf489746d49221abb93299ea5e557 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Fri, 7 Jul 2023 18:11:28 -0700 Subject: [PATCH 2/2] GzConfigureProject: add list of exported variables Signed-off-by: Steve Peters --- cmake/GzConfigureProject.cmake | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/cmake/GzConfigureProject.cmake b/cmake/GzConfigureProject.cmake index 5b2e893b..381ade62 100644 --- a/cmake/GzConfigureProject.cmake +++ b/cmake/GzConfigureProject.cmake @@ -19,6 +19,30 @@ # gz/${GZ_DESIGNATION} # VERSION_SUFFIX: Optional. Specify a prerelease version suffix. # +# The following variables are automatically defined by project(~) in cmake 3: +# PROJECT_NAME +# PROJECT_VERSION_MAJOR +# PROJECT_VERSION_MINOR +# PROJECT_VERSION_PATCH +# +# This macro defines the following variables as well: +# GZ_DESIGNATION +# GZ_DESIGNATION_LOWER +# GZ_DESIGNATION_UPPER +# PKG_NAME +# PROJECT_CMAKE_EXTRAS_INSTALL_DIR +# PROJECT_CMAKE_EXTRAS_PATH_TO_PREFIX +# PROJECT_INCLUDE_DIR +# PROJECT_NAME_NO_VERSION +# PROJECT_NAME_NO_VERSION_LOWER +# PROJECT_NAME_NO_VERSION_UPPER +# PROJECT_NAME_LOWER +# PROJECT_NAME_UPPER +# PROJECT_VERSION +# PROJECT_VERSION_FULL +# PROJECT_VERSION_FULL_NO_SUFFIX +# PROJECT_VERSION_SUFFIX +# #=============================================================================== # Copyright (C) 2017 Open Source Robotics Foundation #