From: Jochen Sprickerhof <jspricke@debian.org>
Date: Tue, 22 Dec 2020 00:10:27 +0100
Subject: Make cmake_conf_version_file ARCH_INDEPENDENT

---
 CMakeLists.txt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e5dd84..ca2e6f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,13 +36,11 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/${cmake_conf_file}.in" "${CMAK
 set(cmake_conf_version_file "${PROJECT_NAME}-config-version.cmake")
 # Use write_basic_package_version_file to generate a ConfigVersion file that
 # allow users of gazebo to specify the API or version to depend on
-# TODO: keep this instruction until deprecate Ubuntu/Precise and update with
-# https://github.com/Kitware/CMake/blob/v2.8.8/Modules/CMakePackageConfigHelpers.cmake
-include(WriteBasicConfigVersionFile)
-write_basic_config_version_file(
+include(CMakePackageConfigHelpers)
+write_basic_package_version_file(
   ${CMAKE_CURRENT_BINARY_DIR}/${cmake_conf_version_file}
   VERSION "${URDF_VERSION}"
-  COMPATIBILITY SameMajorVersion)
+  COMPATIBILITY SameMajorVersion ARCH_INDEPENDENT)
 install(FILES
   "${CMAKE_BINARY_DIR}/${cmake_conf_file}"
   "${CMAKE_BINARY_DIR}/${cmake_conf_version_file}"