From a48991bde6241810b210dea8b86f531f47bedde3 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 7 Nov 2016 13:23:58 +0200 Subject: rename opencv include file Change-Id: I02abc2e325f06a3926b5d9c3a8396ac54d2b5de5 Reviewed-by: Teemu Holappa --- conf/distro/include/imx6-opencv.inc | 39 ----------------------------------- conf/distro/include/imx6qsabresd.conf | 2 +- conf/distro/include/nitrogen6x.conf | 2 +- conf/distro/include/opencv.inc | 39 +++++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 conf/distro/include/imx6-opencv.inc create mode 100644 conf/distro/include/opencv.inc diff --git a/conf/distro/include/imx6-opencv.inc b/conf/distro/include/imx6-opencv.inc deleted file mode 100644 index a1d37df..0000000 --- a/conf/distro/include/imx6-opencv.inc +++ /dev/null @@ -1,39 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -MACHINE_EXTRA_INSTALL += "\ - libopencv-core \ - libopencv-imgproc \ - libopencv-objdetect \ - " - -MACHINE_EXTRA_INSTALL_SDK += " \ - opencv-dev \ - " - diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf index 2cb9a1f..9983af3 100644 --- a/conf/distro/include/imx6qsabresd.conf +++ b/conf/distro/include/imx6qsabresd.conf @@ -28,7 +28,7 @@ ############################################################################ include conf/distro/include/fsl.inc -include conf/distro/include/imx6-opencv.inc +include conf/distro/include/opencv.inc DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Quad" diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index 4dffde8..a8db798 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -28,7 +28,7 @@ ############################################################################ include conf/distro/include/fsl.inc -include conf/distro/include/imx6-opencv.inc +include conf/distro/include/opencv.inc DEPLOY_CONF_NAME = "Boundary Devices i.MX6" diff --git a/conf/distro/include/opencv.inc b/conf/distro/include/opencv.inc new file mode 100644 index 0000000..a1d37df --- /dev/null +++ b/conf/distro/include/opencv.inc @@ -0,0 +1,39 @@ +############################################################################ +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +MACHINE_EXTRA_INSTALL += "\ + libopencv-core \ + libopencv-imgproc \ + libopencv-objdetect \ + " + +MACHINE_EXTRA_INSTALL_SDK += " \ + opencv-dev \ + " + -- cgit v1.2.3-54-g00ecf