aboutsummaryrefslogtreecommitdiffstats
path: root/host/cmake
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2018-02-19 15:30:32 -0800
committerMartin Braun <martin.braun@ettus.com>2018-02-19 16:54:52 -0800
commitae5211d71dcd0715ed83e1d4949d8425d64cb3d1 (patch)
treed78d7cd9138636a8e860af7fbe0f0ca538681cd5 /host/cmake
parentf15dbc0484adf95c245ac86fb9aa7ea37ccce71b (diff)
downloaduhd-ae5211d71dcd0715ed83e1d4949d8425d64cb3d1.tar.gz
uhd-ae5211d71dcd0715ed83e1d4949d8425d64cb3d1.tar.bz2
uhd-ae5211d71dcd0715ed83e1d4949d8425d64cb3d1.zip
uhd: Update license headers
All copyright is now attributed to "Ettus Research, a National Instruments company". SPDX headers were also updated to latest version 3.0.
Diffstat (limited to 'host/cmake')
-rw-r--r--host/cmake/Modules/FindDocutils.cmake3
-rw-r--r--host/cmake/Modules/FindGPSD.cmake2
-rw-r--r--host/cmake/Modules/FindGZip.cmake3
-rw-r--r--host/cmake/Modules/FindLIBERIO.cmake3
-rw-r--r--host/cmake/Modules/UHDBuildInfo.cmake2
-rw-r--r--host/cmake/Modules/UHDComponent.cmake3
-rw-r--r--host/cmake/Modules/UHDConfig.cmake.in3
-rw-r--r--host/cmake/Modules/UHDConfigVersion.cmake.in3
-rw-r--r--host/cmake/Modules/UHDGlobalDefs.cmake3
-rw-r--r--host/cmake/Modules/UHDPackage.cmake3
-rw-r--r--host/cmake/Modules/UHDPython.cmake3
-rw-r--r--host/cmake/Modules/UHDUnitTest.cmake3
-rw-r--r--host/cmake/Modules/UHDVersion.cmake3
-rwxr-xr-xhost/cmake/debian/postinst.in3
-rwxr-xr-xhost/cmake/debian/postrm.in3
-rwxr-xr-xhost/cmake/debian/preinst.in3
-rwxr-xr-xhost/cmake/debian/prerm.in3
-rw-r--r--host/cmake/msvc/stdbool.h3
-rwxr-xr-xhost/cmake/redhat/post_install.in3
-rwxr-xr-xhost/cmake/redhat/post_uninstall.in3
-rwxr-xr-xhost/cmake/redhat/pre_install.in3
-rwxr-xr-xhost/cmake/redhat/pre_uninstall.in3
22 files changed, 42 insertions, 22 deletions
diff --git a/host/cmake/Modules/FindDocutils.cmake b/host/cmake/Modules/FindDocutils.cmake
index dbe11f76b..7b103879e 100644
--- a/host/cmake/Modules/FindDocutils.cmake
+++ b/host/cmake/Modules/FindDocutils.cmake
@@ -1,7 +1,8 @@
#
# Copyright 2011-2011 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
########################################################################
diff --git a/host/cmake/Modules/FindGPSD.cmake b/host/cmake/Modules/FindGPSD.cmake
index c4297cce2..3e29c7498 100644
--- a/host/cmake/Modules/FindGPSD.cmake
+++ b/host/cmake/Modules/FindGPSD.cmake
@@ -1,7 +1,7 @@
#
# Copyright 2015 Ettus Research LLC
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
# - Find libgps
# Find the Gpsd includes and client library
diff --git a/host/cmake/Modules/FindGZip.cmake b/host/cmake/Modules/FindGZip.cmake
index 590597fa0..029e95a22 100644
--- a/host/cmake/Modules/FindGZip.cmake
+++ b/host/cmake/Modules/FindGZip.cmake
@@ -1,7 +1,8 @@
#
# Copyright 2013 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
########################################################################
diff --git a/host/cmake/Modules/FindLIBERIO.cmake b/host/cmake/Modules/FindLIBERIO.cmake
index dc3a0031b..9a29e52e8 100644
--- a/host/cmake/Modules/FindLIBERIO.cmake
+++ b/host/cmake/Modules/FindLIBERIO.cmake
@@ -1,7 +1,8 @@
#
# Copyright 2017 Ettus Research
+# Copyright 2018 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
# - Find liberio
# Find the liberio includes and client library
diff --git a/host/cmake/Modules/UHDBuildInfo.cmake b/host/cmake/Modules/UHDBuildInfo.cmake
index 82178b290..21b1e3c1d 100644
--- a/host/cmake/Modules/UHDBuildInfo.cmake
+++ b/host/cmake/Modules/UHDBuildInfo.cmake
@@ -1,7 +1,7 @@
#
# Copyright 2015-2016 National Instruments Corp.
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
#
diff --git a/host/cmake/Modules/UHDComponent.cmake b/host/cmake/Modules/UHDComponent.cmake
index 5f75ba51f..da2e1ea2f 100644
--- a/host/cmake/Modules/UHDComponent.cmake
+++ b/host/cmake/Modules/UHDComponent.cmake
@@ -1,7 +1,8 @@
#
# Copyright 2010-2011,2013,2015 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
########################################################################
diff --git a/host/cmake/Modules/UHDConfig.cmake.in b/host/cmake/Modules/UHDConfig.cmake.in
index 637b44766..4651e3a9c 100644
--- a/host/cmake/Modules/UHDConfig.cmake.in
+++ b/host/cmake/Modules/UHDConfig.cmake.in
@@ -1,7 +1,8 @@
#
# Copyright 2014 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
########################################################################
#
diff --git a/host/cmake/Modules/UHDConfigVersion.cmake.in b/host/cmake/Modules/UHDConfigVersion.cmake.in
index 2293323c6..9945789b1 100644
--- a/host/cmake/Modules/UHDConfigVersion.cmake.in
+++ b/host/cmake/Modules/UHDConfigVersion.cmake.in
@@ -1,7 +1,8 @@
#
# Copyright 2014 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
########################################################################
diff --git a/host/cmake/Modules/UHDGlobalDefs.cmake b/host/cmake/Modules/UHDGlobalDefs.cmake
index 759ba6c5b..d21519479 100644
--- a/host/cmake/Modules/UHDGlobalDefs.cmake
+++ b/host/cmake/Modules/UHDGlobalDefs.cmake
@@ -1,7 +1,8 @@
#
# Copyright 2015,2016 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
# This file sets up all the stuff for the config.h file
diff --git a/host/cmake/Modules/UHDPackage.cmake b/host/cmake/Modules/UHDPackage.cmake
index c1dedb025..8bd31910f 100644
--- a/host/cmake/Modules/UHDPackage.cmake
+++ b/host/cmake/Modules/UHDPackage.cmake
@@ -1,7 +1,8 @@
#
# Copyright 2010-2016 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
########################################################################
diff --git a/host/cmake/Modules/UHDPython.cmake b/host/cmake/Modules/UHDPython.cmake
index 041a1ab64..f63f47f03 100644
--- a/host/cmake/Modules/UHDPython.cmake
+++ b/host/cmake/Modules/UHDPython.cmake
@@ -1,7 +1,8 @@
#
# Copyright 2010-2011 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
IF(NOT DEFINED INCLUDED_UHD_PYTHON_CMAKE)
diff --git a/host/cmake/Modules/UHDUnitTest.cmake b/host/cmake/Modules/UHDUnitTest.cmake
index 678399d02..db245484c 100644
--- a/host/cmake/Modules/UHDUnitTest.cmake
+++ b/host/cmake/Modules/UHDUnitTest.cmake
@@ -1,7 +1,8 @@
#
# Copyright 2010-2012,2015 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
########################################################################
diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake
index 378676115..69dcef681 100644
--- a/host/cmake/Modules/UHDVersion.cmake
+++ b/host/cmake/Modules/UHDVersion.cmake
@@ -1,7 +1,8 @@
#
# Copyright 2010-2014,2016 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
########################################################################
diff --git a/host/cmake/debian/postinst.in b/host/cmake/debian/postinst.in
index c7f4058c7..3f82cba76 100755
--- a/host/cmake/debian/postinst.in
+++ b/host/cmake/debian/postinst.in
@@ -1,8 +1,9 @@
#!/bin/sh
#
# Copyright 2011,2013 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
if [ "$1" = "configure" ]; then
diff --git a/host/cmake/debian/postrm.in b/host/cmake/debian/postrm.in
index 6fa4b3ab6..408d3bfa2 100755
--- a/host/cmake/debian/postrm.in
+++ b/host/cmake/debian/postrm.in
@@ -1,8 +1,9 @@
#!/bin/sh
#
# Copyright 2011 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
if [ "$1" = "remove" ]; then
diff --git a/host/cmake/debian/preinst.in b/host/cmake/debian/preinst.in
index 467a9105f..74c3f3a39 100755
--- a/host/cmake/debian/preinst.in
+++ b/host/cmake/debian/preinst.in
@@ -1,8 +1,9 @@
#!/bin/sh
#
# Copyright 2011 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
if [ "$1" = "install" ]; then
diff --git a/host/cmake/debian/prerm.in b/host/cmake/debian/prerm.in
index f9e242283..c4c786128 100755
--- a/host/cmake/debian/prerm.in
+++ b/host/cmake/debian/prerm.in
@@ -1,8 +1,9 @@
#!/bin/sh
#
# Copyright 2011 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
if [ "$1" = "remove" ]; then
diff --git a/host/cmake/msvc/stdbool.h b/host/cmake/msvc/stdbool.h
index 6b76d2871..ffd3fc8a3 100644
--- a/host/cmake/msvc/stdbool.h
+++ b/host/cmake/msvc/stdbool.h
@@ -1,7 +1,8 @@
//
// Copyright 2015 Ettus Research LLC
+// Copyright 2018 Ettus Research, a National Instruments Company
//
-// SPDX-License-Identifier: GPL-3.0
+// SPDX-License-Identifier: GPL-3.0-or-later
//
#ifndef INCLUDED_MSC_STDBOOL_H
diff --git a/host/cmake/redhat/post_install.in b/host/cmake/redhat/post_install.in
index 0264be384..d02ba4441 100755
--- a/host/cmake/redhat/post_install.in
+++ b/host/cmake/redhat/post_install.in
@@ -1,8 +1,9 @@
#!/bin/sh
#
# Copyright 2011,2013 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
cp @CMAKE_INSTALL_PREFIX@/lib/uhd/utils/uhd-usrp.rules /etc/udev/rules.d/uhd-usrp.rules
diff --git a/host/cmake/redhat/post_uninstall.in b/host/cmake/redhat/post_uninstall.in
index 058f8a34c..a08526a7d 100755
--- a/host/cmake/redhat/post_uninstall.in
+++ b/host/cmake/redhat/post_uninstall.in
@@ -1,8 +1,9 @@
#!/bin/sh
#
# Copyright 2011 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
ldconfig
diff --git a/host/cmake/redhat/pre_install.in b/host/cmake/redhat/pre_install.in
index de60cc73d..07426bbf3 100755
--- a/host/cmake/redhat/pre_install.in
+++ b/host/cmake/redhat/pre_install.in
@@ -1,8 +1,9 @@
#!/bin/sh
#
# Copyright 2011 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
echo 'Installing UHD.'
diff --git a/host/cmake/redhat/pre_uninstall.in b/host/cmake/redhat/pre_uninstall.in
index b3fc2f1ec..8fc96a2e9 100755
--- a/host/cmake/redhat/pre_uninstall.in
+++ b/host/cmake/redhat/pre_uninstall.in
@@ -1,8 +1,9 @@
#!/bin/sh
#
# Copyright 2011 Ettus Research LLC
+# Copyright 2018 Ettus Research, a National Instruments Company
#
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
#
echo 'Uninstalling UHD.'