diff options
| -rw-r--r-- | 3rdparty/libyaml.pri | 2 | ||||
| -rw-r--r-- | application-manager.pro | 5 | ||||
| -rw-r--r-- | config.tests/libyaml/libyaml.pro | 7 | ||||
| -rw-r--r-- | config.tests/libyaml/main.cpp | 45 |
4 files changed, 56 insertions, 3 deletions
diff --git a/3rdparty/libyaml.pri b/3rdparty/libyaml.pri index 88ea474a..32dab30a 100644 --- a/3rdparty/libyaml.pri +++ b/3rdparty/libyaml.pri @@ -1,5 +1,5 @@ -bundled-libyaml { +!config_libyaml { LIBYAML_PATH = $$PWD/libyaml LIBYAML_BUILD_PATH = $$shadowed($$LIBYAML_PATH) diff --git a/application-manager.pro b/application-manager.pro index b378914b..d0eea696 100644 --- a/application-manager.pro +++ b/application-manager.pro @@ -1,3 +1,5 @@ +load(configure) +qtCompileTest(libyaml) MIN_MINOR=4 headless:MIN_MINOR=2 @@ -10,7 +12,7 @@ CONFIG += ordered include($$BASE_PRI) bundled-libarchive:SUBDIRS += 3rdparty/libarchive/libarchive.pro -bundled-libyaml:SUBDIRS += 3rdparty/libyaml/libyaml.pro +!config_libyaml:SUBDIRS += 3rdparty/libyaml/libyaml.pro force-singleprocess:force-multiprocess:error("You cannot both specify force-singleprocess and force-multiprocess") qtHaveModule(compositor)|headless { check_multi = "yes (auto detect)" } else { check_multi = "no (auto detect)" } @@ -39,7 +41,6 @@ printConfigLine("Multi-process mode", $$check_multi, auto) printConfigLine("Installer enabled", $$yesNo(!CONFIG(disable-installer)), auto) printConfigLine("Tests enabled", $$yesNo(CONFIG(enable-tests)), auto) printConfigLine("Bundled libarchive", $$yesNo(CONFIG(bundled-libarchive)), auto) -printConfigLine("Bundled libyaml", $$yesNo(CONFIG(bundled-libyaml)), auto) printConfigLine("libcrypto defines", $$check_libcrypto_defines, auto) printConfigLine("libcrypto includes", $$check_libcrypto_includes, auto) printConfigLine("SSDP support", $$yesNo(qtHaveModule(pssdp)), auto) diff --git a/config.tests/libyaml/libyaml.pro b/config.tests/libyaml/libyaml.pro new file mode 100644 index 00000000..72cdd371 --- /dev/null +++ b/config.tests/libyaml/libyaml.pro @@ -0,0 +1,7 @@ +TARGET = libyaml +CONFIG -= qt + +SOURCES += main.cpp + +PKGCONFIG += "'yaml-0.1 >= 0.1.6'" +CONFIG += link_pkgconfig diff --git a/config.tests/libyaml/main.cpp b/config.tests/libyaml/main.cpp new file mode 100644 index 00000000..f2ee04e1 --- /dev/null +++ b/config.tests/libyaml/main.cpp @@ -0,0 +1,45 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Application Manager +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <yaml.h> + +int main() +{ + yaml_parser_t p; + yaml_parser_initialize(&p); + + return 0; +} |