Skip to content

Commit 0f7fa8a

Browse files
committed
Remove IS_VENDORED_OUTPUT_VARIABLE_NAME output variable
Signed-off-by: Silvio Traversaro <silvio.traversaro@gbionics.ai>
1 parent d940d58 commit 0f7fa8a

File tree

1 file changed

+3
-22
lines changed

1 file changed

+3
-22
lines changed

ament_cmake_vendor_package/cmake/ament_vendor.cmake

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@
4848
# project, expose the external project globally to any downstream CMake
4949
# projects.
5050
# :type GLOBAL_HOOK: option
51-
# :param IS_VENDORED_OUTPUT_VARIABLE_NAME: the name of the variable that
52-
# will be set to ``TRUE`` if the package has been vendored, or ``FALSE``
53-
# otherwise.
54-
# :type IS_VENDORED_OUTPUT_VARIABLE_NAME: string
5551
#
5652
# The AMENT_VENDOR_POLICY cache entry and the SATISFIED argument
5753
# control whether or not this function builds the vendor package.
@@ -74,9 +70,8 @@
7470
# or false. This option is in unsupported by most packages,
7571
# so use at your own risk, as it could break the buid.
7672
#
77-
# To check if a package has been actually vendored, pass a variable name
78-
# into the argument IS_VENDORED_OUTPUT_VARIABLE_NAME, and check
79-
# if the variable is TRUE after you call `ament_vendor`.
73+
# To check if a package has been actually vendored, check if the target name
74+
# passed as TARGET_NAME exists with if(TARGET <target_name>).
8075
#
8176
# @public
8277
#
@@ -89,7 +84,7 @@ macro(ament_vendor TARGET_NAME)
8984
message(FATAL_ERROR "ament_vendor() must be called before ament_package()")
9085
endif()
9186

92-
cmake_parse_arguments(_ARG "GLOBAL_HOOK;SKIP_INSTALL" "SOURCE_SUBDIR;VCS_TYPE;VCS_URL;VCS_VERSION;SATISFIED;IS_VENDORED_OUTPUT_VARIABLE_NAME" "CMAKE_ARGS;PATCHES" ${ARGN})
87+
cmake_parse_arguments(_ARG "GLOBAL_HOOK;SKIP_INSTALL" "SOURCE_SUBDIR;VCS_TYPE;VCS_URL;VCS_VERSION;SATISFIED" "CMAKE_ARGS;PATCHES" ${ARGN})
9388
if(_ARG_UNPARSED_ARGUMENTS)
9489
message(FATAL_ERROR "ament_vendor() called with unused arguments: "
9590
"${_ARG_UNPARSED_ARGUMENTS}")
@@ -122,14 +117,6 @@ macro(ament_vendor TARGET_NAME)
122117
set(_ARG_SATISFIED FALSE)
123118
endif()
124119

125-
# If defined, let's set ${_ARG_IS_VENDORED_OUTPUT_VARIABLE_NAME} to FALSE, it will be set
126-
# to TRUE if the package is actually vendored
127-
if(DEFINED _ARG_IS_VENDORED_OUTPUT_VARIABLE_NAME)
128-
# There is no PARENT_SCOPE as this is a cmake macro,
129-
# if it is converted to a function PARENT_SCOPE will need to be added
130-
set(${_ARG_IS_VENDORED_OUTPUT_VARIABLE_NAME} FALSE)
131-
endif()
132-
133120
option(FORCE_BUILD_VENDOR_PKG
134121
"Build vendor packages from source, even if system-installed packages are available"
135122
OFF)
@@ -186,12 +173,6 @@ macro(ament_vendor TARGET_NAME)
186173
"${_ARG_SKIP_INSTALL}"
187174
)
188175

189-
if(DEFINED _ARG_IS_VENDORED_OUTPUT_VARIABLE_NAME)
190-
# There is no PARENT_SCOPE as this is a cmake macro,
191-
# if it is converted to a function PARENT_SCOPE will need to be added
192-
set(${_ARG_IS_VENDORED_OUTPUT_VARIABLE_NAME} TRUE)
193-
endif()
194-
195176
if(NOT _ament_vendor_called AND NOT _ARG_SKIP_INSTALL)
196177
# Hooks for CMAKE_PREFIX_PATH
197178
if(_ARG_GLOBAL_HOOK)

0 commit comments

Comments
 (0)