From 74db1b0330bbd483fcb2f5502fab029676d8e711 Mon Sep 17 00:00:00 2001 From: Rylie Pavlik Date: Mon, 4 Dec 2023 11:47:36 -0600 Subject: [PATCH] cmake: Updates --- cmake/FindHIDAPI.cmake | 4 ++-- cmake/FindLibusb1.cmake | 2 +- cmake/FindSystemd.cmake | 33 ++++++++++++++++++++++++++- cmake/GenerateKhrManifest.cmake | 4 ++-- cmake/openxr_manifest.in.json.license | 2 +- 5 files changed, 38 insertions(+), 7 deletions(-) diff --git a/cmake/FindHIDAPI.cmake b/cmake/FindHIDAPI.cmake index 3e3917ef8..84281d9f1 100644 --- a/cmake/FindHIDAPI.cmake +++ b/cmake/FindHIDAPI.cmake @@ -46,11 +46,11 @@ # Copyright 2009-2010, Iowa State University # Copyright 2019-2021, Collabora, Ltd. # -# SPDX-License-Identifier: BSL-1.0 -# # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +# +# SPDX-License-Identifier: BSL-1.0 set(HIDAPI_ROOT_DIR "${HIDAPI_ROOT_DIR}" diff --git a/cmake/FindLibusb1.cmake b/cmake/FindLibusb1.cmake index 4dd43dee9..295245a54 100644 --- a/cmake/FindLibusb1.cmake +++ b/cmake/FindLibusb1.cmake @@ -15,7 +15,7 @@ # # Original Author: # 2009-2021 Rylie Pavlik -# https://ryliepavlik.com +# https://ryliepavlik.com/ # # Copyright 2009-2010, Iowa State University # Copyright 2021, Collabora, Ltd. diff --git a/cmake/FindSystemd.cmake b/cmake/FindSystemd.cmake index b41b37169..1f95eb835 100644 --- a/cmake/FindSystemd.cmake +++ b/cmake/FindSystemd.cmake @@ -18,12 +18,43 @@ # Copyright (c) 2020-2021 Collabora, Ltd. # # Distributed under the OSI-approved BSD License (the "License"); +# see below. # # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. -#============================================================================= +# # SPDX-License-Identifier: BSD-3-Clause +#============================================================================= +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# * Neither the names of Kitware, Inc., the Insight Software Consortium, +# nor the names of their contributors may be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#============================================================================= include(FeatureSummary) set_package_properties( diff --git a/cmake/GenerateKhrManifest.cmake b/cmake/GenerateKhrManifest.cmake index 3afc05a83..b184418c5 100644 --- a/cmake/GenerateKhrManifest.cmake +++ b/cmake/GenerateKhrManifest.cmake @@ -1,9 +1,9 @@ -# Copyright 2019-2022, Collabora, Ltd. +# Copyright 2019-2023, Collabora, Ltd. # # SPDX-License-Identifier: BSL-1.0 # # Maintained by: -# 2019-2022 Rylie Pavlik +# 2019-2023 Rylie Pavlik #[[.rst: GenerateKhrManifest diff --git a/cmake/openxr_manifest.in.json.license b/cmake/openxr_manifest.in.json.license index 7f85a5f59..237108040 100644 --- a/cmake/openxr_manifest.in.json.license +++ b/cmake/openxr_manifest.in.json.license @@ -1,3 +1,3 @@ -Copyright 2018-2020, Collabora, Ltd. +Copyright 2018-2023, Collabora, Ltd. SPDX-License-Identifier: BSL-1.0