diff --git a/.github/aur/PKGBUILD_Qt5.erb b/.github/aur/PKGBUILD_Qt5.erb index 35becca8..8271386f 100644 --- a/.github/aur/PKGBUILD_Qt5.erb +++ b/.github/aur/PKGBUILD_Qt5.erb @@ -8,7 +8,7 @@ pkgdesc='Music player for the large local collections (Qt5 version)' arch=('x86_64') url="https://github.com/olegantonyan/mpz" license=('GPL3') -depends=('qt5-multimedia' 'qt5-x11extras' 'hicolor-icon-theme' 'yaml-cpp' 'taglib') +depends=('cmake' 'qt5-multimedia' 'qt5-x11extras' 'hicolor-icon-theme' 'yaml-cpp' 'taglib') provides=('mpz') conflicts=('mpz') source=("$pkgname-$pkgver-$pkgrel.zip::<%= source %>") @@ -20,13 +20,13 @@ build() { rm -rf build mkdir build cd build - qmake-qt5 CONFIG+=release DEFINES+=USE_SYSTEM_TAGLIB DEFINES+=USE_SYSTEM_YAMLCPP .. - make + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DUSE_SYSTEM_TAGLIB=ON -DUSE_SYSTEM_YAMLCPP=ON -DUSE_QT5 .. + cmake --build . } package() { cd mpz-<%= commit_hash %> cd build - make install INSTALL_ROOT=$pkgdir + DESTDIR="$pkgdir" cmake --install . } diff --git a/.github/aur/PKGBUILD_Qt6.erb b/.github/aur/PKGBUILD_Qt6.erb index 1e48416f..40abb2bb 100644 --- a/.github/aur/PKGBUILD_Qt6.erb +++ b/.github/aur/PKGBUILD_Qt6.erb @@ -8,7 +8,7 @@ pkgdesc='Music player for the large local collections' arch=('x86_64') url="https://github.com/olegantonyan/mpz" license=('GPL3') -depends=('qt6-multimedia' 'hicolor-icon-theme' 'yaml-cpp' 'taglib') +depends=('cmake' 'qt6-multimedia' 'hicolor-icon-theme' 'yaml-cpp' 'taglib') provides=('<%= pkgname %>') source=("$pkgname-$pkgver-$pkgrel.zip::<%= source %>") sha256sums=('<%= sha256sums %>') @@ -19,13 +19,13 @@ build() { rm -rf build mkdir build cd build - qmake6 CONFIG+=release DEFINES+=USE_SYSTEM_TAGLIB DEFINES+=USE_SYSTEM_YAMLCPP .. - make + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DUSE_SYSTEM_TAGLIB=ON -DUSE_SYSTEM_YAMLCPP=ON .. + cmake --build . } package() { cd mpz-<%= commit_hash %> cd build - make install INSTALL_ROOT=$pkgdir + DESTDIR="$pkgdir" cmake --install . } diff --git a/.github/aur/SRCINFO_Qt5.erb b/.github/aur/SRCINFO_Qt5.erb index 2c559bf8..171c9825 100644 --- a/.github/aur/SRCINFO_Qt5.erb +++ b/.github/aur/SRCINFO_Qt5.erb @@ -10,6 +10,7 @@ pkgbase = <%= pkgname %> depends = hicolor-icon-theme depends = yaml-cpp depends = taglib + depends = cmake provides = mpz conflicts = mpz source = <%= pkgname %>-<%= pkgver %>-<%= pkgrel %>.zip::<%= source %> diff --git a/.github/aur/SRCINFO_Qt6.erb b/.github/aur/SRCINFO_Qt6.erb index 238ec079..792f4838 100644 --- a/.github/aur/SRCINFO_Qt6.erb +++ b/.github/aur/SRCINFO_Qt6.erb @@ -9,6 +9,7 @@ pkgbase = <%= pkgname %> depends = hicolor-icon-theme depends = yaml-cpp depends = taglib + depends = cmake provides = <%= pkgname %> source = <%= pkgname %>-<%= pkgver %>-<%= pkgrel %>.zip::<%= source %> sha256sums = <%= sha256sums %> diff --git a/.github/release-aur-github-action.rb b/.github/release-aur-github-action.rb index b066208c..cfeefd50 100755 --- a/.github/release-aur-github-action.rb +++ b/.github/release-aur-github-action.rb @@ -23,7 +23,7 @@ aur_repo = "ssh://aur@aur.archlinux.org/#{pkgname}.git" pkgrel = `git log --oneline $(git describe --tags --abbrev=0).. | wc -l`.strip -pkgver = /(?<=").+(?=\\\\\\\")/.match(::File.read('version.pri')).to_s.strip +pkgver = /project\(mpz VERSION (.+) LANGUAGES/.match(::File.read('CMakeLists.txt'))[1].to_s.strip sha256sums = ::Digest::SHA256.hexdigest(::URI.open(source).read) author_name = `git --no-pager log -1 --pretty=format:'%an'`.strip author_email = `git --no-pager log -1 --pretty=format:'%ae'`.strip diff --git a/.omnipackage/config.yml b/.omnipackage/config.yml index a4800b4d..1537960c 100644 --- a/.omnipackage/config.yml +++ b/.omnipackage/config.yml @@ -1,8 +1,8 @@ extract_version: provider: 'file' file: - file: 'version.pri' - regex: 'VERSION=\\\\\\"(.+)\\\\\\"' + file: 'CMakeLists.txt' + regex: 'project\(mpz VERSION (.+) LANGUAGES' rpm: &rpm installable_package_name: 'mpz' @@ -16,38 +16,39 @@ deb: &deb opensuse_qt5: &opensuse_qt5 - build_dependencies: [gcc, make, libqt5-qtbase-devel, libqt5-qtmultimedia-devel, libqt5-qtx11extras-devel] + build_dependencies: [gcc, make, cmake, libqt5-qtbase-devel, libqt5-qtmultimedia-devel, libqt5-qtx11extras-devel] + CMAKE_EXTRA_CLI: '-DUSE_QT5=ON' <<: *rpm opensuse_qt6: &opensuse_qt6 - build_dependencies: [gcc, make, qt6-base-common-devel, qt6-multimedia-devel, qt6-widgets-devel, qt6-concurrent-devel] - qmake: qmake6 + build_dependencies: [gcc, make, cmake, qt6-base-common-devel, qt6-multimedia-devel, qt6-widgets-devel, qt6-concurrent-devel] <<: *rpm mageia_qt5: &mageia_qt5 - build_dependencies: [gcc, make, qtbase5-common-devel lib64qt5core-devel lib64qt5gui-devel lib64qt5widgets-devel lib64qt5concurrent-devel, lib64qt5multimedia-devel, lib64qt5x11extras-devel] + build_dependencies: [gcc, make, cmake, qtbase5-common-devel lib64qt5core-devel lib64qt5gui-devel lib64qt5widgets-devel lib64qt5concurrent-devel, lib64qt5multimedia-devel, lib64qt5x11extras-devel] + CMAKE_EXTRA_CLI: '-DUSE_QT5=ON' <<: *rpm readhat_qt5: &readhat_qt5 - build_dependencies: [gcc, make, qt5-qtbase-devel, qt5-qtmultimedia-devel, qt5-qtx11extras-devel] + build_dependencies: [gcc, make, cmake, qt5-qtbase-devel, qt5-qtmultimedia-devel, qt5-qtx11extras-devel] + CMAKE_EXTRA_CLI: '-DUSE_QT5=ON' <<: *rpm readhat_qt6: &readhat_qt6 - build_dependencies: [gcc, make, qt6-qtbase-devel, qt6-qtmultimedia-devel] - qmake: qmake6 + build_dependencies: [gcc, make, cmake, qt6-qtbase-devel, qt6-qtmultimedia-devel] <<: *rpm debian_qt5: &debian_qt5 - build_dependencies: [gcc, make, qt5-qmake, qtbase5-dev-tools, qtchooser, qtbase5-dev, qtmultimedia5-dev, libqt5x11extras5-dev] + build_dependencies: [gcc, make, cmake, qtbase5-dev-tools, qtchooser, qtbase5-dev, qtmultimedia5-dev, libqt5x11extras5-dev] runtime_dependencies: [libqt5multimedia5-plugins] - qt_select: qt5 + CMAKE_EXTRA_CLI: '-DUSE_QT5=ON' <<: *deb debian_qt6: &debian_qt6 - build_dependencies: [gcc, make, qmake6, qt6-tools-dev, qt6-base-dev, qt6-multimedia-dev] + build_dependencies: [gcc, make, cmake, qt6-tools-dev, qt6-base-dev, qt6-multimedia-dev] before_build_script: '.omnipackage/debian_qt6_hack.sh' <<: *deb diff --git a/.omnipackage/deb/rules.liquid b/.omnipackage/deb/rules.liquid index bffac6ac..aa0544a5 100644 --- a/.omnipackage/deb/rules.liquid +++ b/.omnipackage/deb/rules.liquid @@ -3,9 +3,6 @@ # Be carefull, this is a Makefile, so the indents are tabs and not spaces! # -*- makefile -*- -export DESTROOT=$(CURDIR)/debian/mpz -export QT_SELECT={{ qt_select | default: "qt5" }} - {% if LDFLAGS %} export LDFLAGS={{ LDFLAGS }} {% endif %} @@ -16,5 +13,5 @@ export CPPFLAGS={{ CPPFLAGS }} %: dh $@ -override_dh_auto_install: - make install INSTALL_ROOT=$(DESTROOT) +override_dh_auto_configure: + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr {{ CMAKE_EXTRA_CLI }} diff --git a/.omnipackage/mpz.spec.liquid b/.omnipackage/mpz.spec.liquid index 1b742f40..108f87f2 100644 --- a/.omnipackage/mpz.spec.liquid +++ b/.omnipackage/mpz.spec.liquid @@ -22,16 +22,16 @@ Similar to "album list" in Foobar2000. %build -mkdir build -cd build -{{ qmake | default: "qmake-qt5" }} CONFIG+=release {{ qmake_extra_args }} .. +mkdir _build +cd _build +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr {{ CMAKE_EXTRA_CLI }} .. make %{?_smp_mflags} %install -cd build -make install INSTALL_ROOT=%{buildroot} +cd _build +make install %files diff --git a/libs/qhotkey/QHotkey-1.5.0/.github/workflows/build.yml b/3rdparty/QHotkey-1.5.0/.github/workflows/build.yml similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/.github/workflows/build.yml rename to 3rdparty/QHotkey-1.5.0/.github/workflows/build.yml diff --git a/libs/qhotkey/QHotkey-1.5.0/.gitignore b/3rdparty/QHotkey-1.5.0/.gitignore similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/.gitignore rename to 3rdparty/QHotkey-1.5.0/.gitignore diff --git a/libs/qhotkey/QHotkey-1.5.0/CMakeLists.txt b/3rdparty/QHotkey-1.5.0/CMakeLists.txt similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/CMakeLists.txt rename to 3rdparty/QHotkey-1.5.0/CMakeLists.txt diff --git a/libs/qhotkey/QHotkey-1.5.0/HotkeyTest/CMakeLists.txt b/3rdparty/QHotkey-1.5.0/HotkeyTest/CMakeLists.txt similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/HotkeyTest/CMakeLists.txt rename to 3rdparty/QHotkey-1.5.0/HotkeyTest/CMakeLists.txt diff --git a/libs/qhotkey/QHotkey-1.5.0/HotkeyTest/HotkeyTest.pro b/3rdparty/QHotkey-1.5.0/HotkeyTest/HotkeyTest.pro similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/HotkeyTest/HotkeyTest.pro rename to 3rdparty/QHotkey-1.5.0/HotkeyTest/HotkeyTest.pro diff --git a/libs/qhotkey/QHotkey-1.5.0/HotkeyTest/hottestwidget.cpp b/3rdparty/QHotkey-1.5.0/HotkeyTest/hottestwidget.cpp similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/HotkeyTest/hottestwidget.cpp rename to 3rdparty/QHotkey-1.5.0/HotkeyTest/hottestwidget.cpp diff --git a/libs/qhotkey/QHotkey-1.5.0/HotkeyTest/hottestwidget.h b/3rdparty/QHotkey-1.5.0/HotkeyTest/hottestwidget.h similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/HotkeyTest/hottestwidget.h rename to 3rdparty/QHotkey-1.5.0/HotkeyTest/hottestwidget.h diff --git a/libs/qhotkey/QHotkey-1.5.0/HotkeyTest/hottestwidget.ui b/3rdparty/QHotkey-1.5.0/HotkeyTest/hottestwidget.ui similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/HotkeyTest/hottestwidget.ui rename to 3rdparty/QHotkey-1.5.0/HotkeyTest/hottestwidget.ui diff --git a/libs/qhotkey/QHotkey-1.5.0/HotkeyTest/main.cpp b/3rdparty/QHotkey-1.5.0/HotkeyTest/main.cpp similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/HotkeyTest/main.cpp rename to 3rdparty/QHotkey-1.5.0/HotkeyTest/main.cpp diff --git a/libs/qhotkey/QHotkey-1.5.0/LICENSE b/3rdparty/QHotkey-1.5.0/LICENSE similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/LICENSE rename to 3rdparty/QHotkey-1.5.0/LICENSE diff --git a/libs/qhotkey/QHotkey-1.5.0/QHotkey.pro b/3rdparty/QHotkey-1.5.0/QHotkey.pro similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/QHotkey.pro rename to 3rdparty/QHotkey-1.5.0/QHotkey.pro diff --git a/libs/qhotkey/QHotkey-1.5.0/QHotkey/QHotkey b/3rdparty/QHotkey-1.5.0/QHotkey/QHotkey similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/QHotkey/QHotkey rename to 3rdparty/QHotkey-1.5.0/QHotkey/QHotkey diff --git a/libs/qhotkey/QHotkey-1.5.0/QHotkey/QHotkey.pro b/3rdparty/QHotkey-1.5.0/QHotkey/QHotkey.pro similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/QHotkey/QHotkey.pro rename to 3rdparty/QHotkey-1.5.0/QHotkey/QHotkey.pro diff --git a/libs/qhotkey/QHotkey-1.5.0/QHotkey/qhotkey.cpp b/3rdparty/QHotkey-1.5.0/QHotkey/qhotkey.cpp similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/QHotkey/qhotkey.cpp rename to 3rdparty/QHotkey-1.5.0/QHotkey/qhotkey.cpp diff --git a/libs/qhotkey/QHotkey-1.5.0/QHotkey/qhotkey.h b/3rdparty/QHotkey-1.5.0/QHotkey/qhotkey.h similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/QHotkey/qhotkey.h rename to 3rdparty/QHotkey-1.5.0/QHotkey/qhotkey.h diff --git a/libs/qhotkey/QHotkey-1.5.0/QHotkey/qhotkey.pri b/3rdparty/QHotkey-1.5.0/QHotkey/qhotkey.pri similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/QHotkey/qhotkey.pri rename to 3rdparty/QHotkey-1.5.0/QHotkey/qhotkey.pri diff --git a/libs/qhotkey/QHotkey-1.5.0/QHotkey/qhotkey_mac.cpp b/3rdparty/QHotkey-1.5.0/QHotkey/qhotkey_mac.cpp similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/QHotkey/qhotkey_mac.cpp rename to 3rdparty/QHotkey-1.5.0/QHotkey/qhotkey_mac.cpp diff --git a/libs/qhotkey/QHotkey-1.5.0/QHotkey/qhotkey_p.h b/3rdparty/QHotkey-1.5.0/QHotkey/qhotkey_p.h similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/QHotkey/qhotkey_p.h rename to 3rdparty/QHotkey-1.5.0/QHotkey/qhotkey_p.h diff --git a/libs/qhotkey/QHotkey-1.5.0/QHotkey/qhotkey_win.cpp b/3rdparty/QHotkey-1.5.0/QHotkey/qhotkey_win.cpp similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/QHotkey/qhotkey_win.cpp rename to 3rdparty/QHotkey-1.5.0/QHotkey/qhotkey_win.cpp diff --git a/libs/qhotkey/QHotkey-1.5.0/QHotkey/qhotkey_x11.cpp b/3rdparty/QHotkey-1.5.0/QHotkey/qhotkey_x11.cpp similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/QHotkey/qhotkey_x11.cpp rename to 3rdparty/QHotkey-1.5.0/QHotkey/qhotkey_x11.cpp diff --git a/libs/qhotkey/QHotkey-1.5.0/README.md b/3rdparty/QHotkey-1.5.0/README.md similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/README.md rename to 3rdparty/QHotkey-1.5.0/README.md diff --git a/libs/qhotkey/QHotkey-1.5.0/doc/Doxyfile b/3rdparty/QHotkey-1.5.0/doc/Doxyfile similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/doc/Doxyfile rename to 3rdparty/QHotkey-1.5.0/doc/Doxyfile diff --git a/libs/qhotkey/QHotkey-1.5.0/doc/qhotkey.dox b/3rdparty/QHotkey-1.5.0/doc/qhotkey.dox similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/doc/qhotkey.dox rename to 3rdparty/QHotkey-1.5.0/doc/qhotkey.dox diff --git a/libs/qhotkey/QHotkey-1.5.0/qhotkey.prc b/3rdparty/QHotkey-1.5.0/qhotkey.prc similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/qhotkey.prc rename to 3rdparty/QHotkey-1.5.0/qhotkey.prc diff --git a/libs/qhotkey/QHotkey-1.5.0/qhotkey.pri b/3rdparty/QHotkey-1.5.0/qhotkey.pri similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/qhotkey.pri rename to 3rdparty/QHotkey-1.5.0/qhotkey.pri diff --git a/libs/qhotkey/QHotkey-1.5.0/qpm.json b/3rdparty/QHotkey-1.5.0/qpm.json similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/qpm.json rename to 3rdparty/QHotkey-1.5.0/qpm.json diff --git a/libs/qhotkey/QHotkey-1.5.0/qpmx.json b/3rdparty/QHotkey-1.5.0/qpmx.json similarity index 100% rename from libs/qhotkey/QHotkey-1.5.0/qpmx.json rename to 3rdparty/QHotkey-1.5.0/qpmx.json diff --git a/libs/qtwaitingspinner/.gitignore b/3rdparty/qtwaitingspinner/.gitignore similarity index 100% rename from libs/qtwaitingspinner/.gitignore rename to 3rdparty/qtwaitingspinner/.gitignore diff --git a/libs/qtwaitingspinner/LICENSE b/3rdparty/qtwaitingspinner/LICENSE similarity index 100% rename from libs/qtwaitingspinner/LICENSE rename to 3rdparty/qtwaitingspinner/LICENSE diff --git a/libs/qtwaitingspinner/README.md b/3rdparty/qtwaitingspinner/README.md similarity index 100% rename from libs/qtwaitingspinner/README.md rename to 3rdparty/qtwaitingspinner/README.md diff --git a/libs/qtwaitingspinner/qtwaitingspinner.pri b/3rdparty/qtwaitingspinner/qtwaitingspinner.pri similarity index 100% rename from libs/qtwaitingspinner/qtwaitingspinner.pri rename to 3rdparty/qtwaitingspinner/qtwaitingspinner.pri diff --git a/libs/qtwaitingspinner/qtwaitingspinner.pro b/3rdparty/qtwaitingspinner/qtwaitingspinner.pro similarity index 100% rename from libs/qtwaitingspinner/qtwaitingspinner.pro rename to 3rdparty/qtwaitingspinner/qtwaitingspinner.pro diff --git a/libs/qtwaitingspinner/waitingspinnerwidget.cpp b/3rdparty/qtwaitingspinner/waitingspinnerwidget.cpp similarity index 100% rename from libs/qtwaitingspinner/waitingspinnerwidget.cpp rename to 3rdparty/qtwaitingspinner/waitingspinnerwidget.cpp diff --git a/libs/qtwaitingspinner/waitingspinnerwidget.h b/3rdparty/qtwaitingspinner/waitingspinnerwidget.h similarity index 100% rename from libs/qtwaitingspinner/waitingspinnerwidget.h rename to 3rdparty/qtwaitingspinner/waitingspinnerwidget.h diff --git a/libs/taglib/taglib-2.0.2/AUTHORS b/3rdparty/taglib-2.0.2/AUTHORS similarity index 100% rename from libs/taglib/taglib-2.0.2/AUTHORS rename to 3rdparty/taglib-2.0.2/AUTHORS diff --git a/libs/taglib/taglib-2.0.2/CHANGELOG.md b/3rdparty/taglib-2.0.2/CHANGELOG.md similarity index 100% rename from libs/taglib/taglib-2.0.2/CHANGELOG.md rename to 3rdparty/taglib-2.0.2/CHANGELOG.md diff --git a/libs/taglib/taglib-2.0.2/CMakeLists.txt b/3rdparty/taglib-2.0.2/CMakeLists.txt similarity index 100% rename from libs/taglib/taglib-2.0.2/CMakeLists.txt rename to 3rdparty/taglib-2.0.2/CMakeLists.txt diff --git a/libs/taglib/taglib-2.0.2/COPYING.LGPL b/3rdparty/taglib-2.0.2/COPYING.LGPL similarity index 100% rename from libs/taglib/taglib-2.0.2/COPYING.LGPL rename to 3rdparty/taglib-2.0.2/COPYING.LGPL diff --git a/libs/taglib/taglib-2.0.2/COPYING.MPL b/3rdparty/taglib-2.0.2/COPYING.MPL similarity index 100% rename from libs/taglib/taglib-2.0.2/COPYING.MPL rename to 3rdparty/taglib-2.0.2/COPYING.MPL diff --git a/libs/taglib/taglib-2.0.2/ConfigureChecks.cmake b/3rdparty/taglib-2.0.2/ConfigureChecks.cmake similarity index 100% rename from libs/taglib/taglib-2.0.2/ConfigureChecks.cmake rename to 3rdparty/taglib-2.0.2/ConfigureChecks.cmake diff --git a/libs/taglib/taglib-2.0.2/Doxyfile.cmake b/3rdparty/taglib-2.0.2/Doxyfile.cmake similarity index 100% rename from libs/taglib/taglib-2.0.2/Doxyfile.cmake rename to 3rdparty/taglib-2.0.2/Doxyfile.cmake diff --git a/libs/taglib/taglib-2.0.2/INSTALL.md b/3rdparty/taglib-2.0.2/INSTALL.md similarity index 100% rename from libs/taglib/taglib-2.0.2/INSTALL.md rename to 3rdparty/taglib-2.0.2/INSTALL.md diff --git a/libs/taglib/taglib-2.0.2/README.md b/3rdparty/taglib-2.0.2/README.md similarity index 100% rename from libs/taglib/taglib-2.0.2/README.md rename to 3rdparty/taglib-2.0.2/README.md diff --git a/libs/taglib/taglib-2.0.2/bindings/CMakeLists.txt b/3rdparty/taglib-2.0.2/bindings/CMakeLists.txt similarity index 100% rename from libs/taglib/taglib-2.0.2/bindings/CMakeLists.txt rename to 3rdparty/taglib-2.0.2/bindings/CMakeLists.txt diff --git a/libs/taglib/taglib-2.0.2/bindings/README b/3rdparty/taglib-2.0.2/bindings/README similarity index 100% rename from libs/taglib/taglib-2.0.2/bindings/README rename to 3rdparty/taglib-2.0.2/bindings/README diff --git a/libs/taglib/taglib-2.0.2/bindings/c/CMakeLists.txt b/3rdparty/taglib-2.0.2/bindings/c/CMakeLists.txt similarity index 100% rename from libs/taglib/taglib-2.0.2/bindings/c/CMakeLists.txt rename to 3rdparty/taglib-2.0.2/bindings/c/CMakeLists.txt diff --git a/libs/taglib/taglib-2.0.2/bindings/c/tag_c.cpp b/3rdparty/taglib-2.0.2/bindings/c/tag_c.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/bindings/c/tag_c.cpp rename to 3rdparty/taglib-2.0.2/bindings/c/tag_c.cpp diff --git a/libs/taglib/taglib-2.0.2/bindings/c/tag_c.h b/3rdparty/taglib-2.0.2/bindings/c/tag_c.h similarity index 100% rename from libs/taglib/taglib-2.0.2/bindings/c/tag_c.h rename to 3rdparty/taglib-2.0.2/bindings/c/tag_c.h diff --git a/libs/taglib/taglib-2.0.2/bindings/c/taglib_c.pc.cmake b/3rdparty/taglib-2.0.2/bindings/c/taglib_c.pc.cmake similarity index 100% rename from libs/taglib/taglib-2.0.2/bindings/c/taglib_c.pc.cmake rename to 3rdparty/taglib-2.0.2/bindings/c/taglib_c.pc.cmake diff --git a/libs/taglib/taglib-2.0.2/cmake/modules/FindCppUnit.cmake b/3rdparty/taglib-2.0.2/cmake/modules/FindCppUnit.cmake similarity index 100% rename from libs/taglib/taglib-2.0.2/cmake/modules/FindCppUnit.cmake rename to 3rdparty/taglib-2.0.2/cmake/modules/FindCppUnit.cmake diff --git a/libs/taglib/taglib-2.0.2/cmake/modules/MacroEnsureVersion.cmake b/3rdparty/taglib-2.0.2/cmake/modules/MacroEnsureVersion.cmake similarity index 100% rename from libs/taglib/taglib-2.0.2/cmake/modules/MacroEnsureVersion.cmake rename to 3rdparty/taglib-2.0.2/cmake/modules/MacroEnsureVersion.cmake diff --git a/libs/taglib/taglib-2.0.2/cmake_uninstall.cmake.in b/3rdparty/taglib-2.0.2/cmake_uninstall.cmake.in similarity index 100% rename from libs/taglib/taglib-2.0.2/cmake_uninstall.cmake.in rename to 3rdparty/taglib-2.0.2/cmake_uninstall.cmake.in diff --git a/libs/taglib/taglib-2.0.2/config.h.cmake b/3rdparty/taglib-2.0.2/config.h.cmake similarity index 100% rename from libs/taglib/taglib-2.0.2/config.h.cmake rename to 3rdparty/taglib-2.0.2/config.h.cmake diff --git a/libs/taglib/taglib-2.0.2/doc/README b/3rdparty/taglib-2.0.2/doc/README similarity index 100% rename from libs/taglib/taglib-2.0.2/doc/README rename to 3rdparty/taglib-2.0.2/doc/README diff --git a/libs/taglib/taglib-2.0.2/doc/api-footer.html b/3rdparty/taglib-2.0.2/doc/api-footer.html similarity index 100% rename from libs/taglib/taglib-2.0.2/doc/api-footer.html rename to 3rdparty/taglib-2.0.2/doc/api-footer.html diff --git a/libs/taglib/taglib-2.0.2/doc/api-header.html b/3rdparty/taglib-2.0.2/doc/api-header.html similarity index 100% rename from libs/taglib/taglib-2.0.2/doc/api-header.html rename to 3rdparty/taglib-2.0.2/doc/api-header.html diff --git a/libs/taglib/taglib-2.0.2/doc/taglib.svg b/3rdparty/taglib-2.0.2/doc/taglib.svg similarity index 100% rename from libs/taglib/taglib-2.0.2/doc/taglib.svg rename to 3rdparty/taglib-2.0.2/doc/taglib.svg diff --git a/libs/taglib/taglib-2.0.2/examples/CMakeLists.txt b/3rdparty/taglib-2.0.2/examples/CMakeLists.txt similarity index 100% rename from libs/taglib/taglib-2.0.2/examples/CMakeLists.txt rename to 3rdparty/taglib-2.0.2/examples/CMakeLists.txt diff --git a/libs/taglib/taglib-2.0.2/examples/framelist.cpp b/3rdparty/taglib-2.0.2/examples/framelist.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/examples/framelist.cpp rename to 3rdparty/taglib-2.0.2/examples/framelist.cpp diff --git a/libs/taglib/taglib-2.0.2/examples/strip-id3v1.cpp b/3rdparty/taglib-2.0.2/examples/strip-id3v1.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/examples/strip-id3v1.cpp rename to 3rdparty/taglib-2.0.2/examples/strip-id3v1.cpp diff --git a/libs/taglib/taglib-2.0.2/examples/tagreader.cpp b/3rdparty/taglib-2.0.2/examples/tagreader.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/examples/tagreader.cpp rename to 3rdparty/taglib-2.0.2/examples/tagreader.cpp diff --git a/libs/taglib/taglib-2.0.2/examples/tagreader_c.c b/3rdparty/taglib-2.0.2/examples/tagreader_c.c similarity index 100% rename from libs/taglib/taglib-2.0.2/examples/tagreader_c.c rename to 3rdparty/taglib-2.0.2/examples/tagreader_c.c diff --git a/libs/taglib/taglib-2.0.2/examples/tagwriter.cpp b/3rdparty/taglib-2.0.2/examples/tagwriter.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/examples/tagwriter.cpp rename to 3rdparty/taglib-2.0.2/examples/tagwriter.cpp diff --git a/3rdparty/taglib-2.0.2/taglib-config.cmake b/3rdparty/taglib-2.0.2/taglib-config.cmake new file mode 100644 index 00000000..ef16a0dc --- /dev/null +++ b/3rdparty/taglib-2.0.2/taglib-config.cmake @@ -0,0 +1,36 @@ + +####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() ####### +####### Any changes to this file will be overwritten by the next CMake run #### +####### The input file was taglib-config.cmake.in ######## + +get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE) + +macro(set_and_check _var _file) + set(${_var} "${_file}") + if(NOT EXISTS "${_file}") + message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !") + endif() +endmacro() + +macro(check_required_components _NAME) + foreach(comp ${${_NAME}_FIND_COMPONENTS}) + if(NOT ${_NAME}_${comp}_FOUND) + if(${_NAME}_FIND_REQUIRED_${comp}) + set(${_NAME}_FOUND FALSE) + endif() + endif() + endforeach() +endmacro() + +#################################################################################### + +include("${CMAKE_CURRENT_LIST_DIR}/taglib-targets.cmake") + +set(TAGLIB_FOUND ${TagLib_FOUND}) +set(TAGLIB_VERSION ${TagLib_VERSION}) + +check_required_components("TagLib") + +if(NOT TARGET TagLib::TagLib) + add_library(TagLib::TagLib ALIAS TagLib::tag) +endif() diff --git a/libs/taglib/taglib-2.0.2/taglib-config.cmake.in b/3rdparty/taglib-2.0.2/taglib-config.cmake.in similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib-config.cmake.in rename to 3rdparty/taglib-2.0.2/taglib-config.cmake.in diff --git a/libs/taglib/taglib-2.0.2/taglib-config.cmd.cmake b/3rdparty/taglib-2.0.2/taglib-config.cmd.cmake similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib-config.cmd.cmake rename to 3rdparty/taglib-2.0.2/taglib-config.cmd.cmake diff --git a/libs/taglib/taglib-2.0.2/taglib.pc.cmake b/3rdparty/taglib-2.0.2/taglib.pc.cmake similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib.pc.cmake rename to 3rdparty/taglib-2.0.2/taglib.pc.cmake diff --git a/libs/taglib/taglib-2.0.2/taglib/CMakeLists.txt b/3rdparty/taglib-2.0.2/taglib/CMakeLists.txt similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/CMakeLists.txt rename to 3rdparty/taglib-2.0.2/taglib/CMakeLists.txt diff --git a/libs/taglib/taglib-2.0.2/taglib/ape/ape-tag-format.txt b/3rdparty/taglib-2.0.2/taglib/ape/ape-tag-format.txt similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ape/ape-tag-format.txt rename to 3rdparty/taglib-2.0.2/taglib/ape/ape-tag-format.txt diff --git a/libs/taglib/taglib-2.0.2/taglib/ape/apefile.cpp b/3rdparty/taglib-2.0.2/taglib/ape/apefile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ape/apefile.cpp rename to 3rdparty/taglib-2.0.2/taglib/ape/apefile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/ape/apefile.h b/3rdparty/taglib-2.0.2/taglib/ape/apefile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ape/apefile.h rename to 3rdparty/taglib-2.0.2/taglib/ape/apefile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/ape/apefooter.cpp b/3rdparty/taglib-2.0.2/taglib/ape/apefooter.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ape/apefooter.cpp rename to 3rdparty/taglib-2.0.2/taglib/ape/apefooter.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/ape/apefooter.h b/3rdparty/taglib-2.0.2/taglib/ape/apefooter.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ape/apefooter.h rename to 3rdparty/taglib-2.0.2/taglib/ape/apefooter.h diff --git a/libs/taglib/taglib-2.0.2/taglib/ape/apeitem.cpp b/3rdparty/taglib-2.0.2/taglib/ape/apeitem.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ape/apeitem.cpp rename to 3rdparty/taglib-2.0.2/taglib/ape/apeitem.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/ape/apeitem.h b/3rdparty/taglib-2.0.2/taglib/ape/apeitem.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ape/apeitem.h rename to 3rdparty/taglib-2.0.2/taglib/ape/apeitem.h diff --git a/libs/taglib/taglib-2.0.2/taglib/ape/apeproperties.cpp b/3rdparty/taglib-2.0.2/taglib/ape/apeproperties.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ape/apeproperties.cpp rename to 3rdparty/taglib-2.0.2/taglib/ape/apeproperties.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/ape/apeproperties.h b/3rdparty/taglib-2.0.2/taglib/ape/apeproperties.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ape/apeproperties.h rename to 3rdparty/taglib-2.0.2/taglib/ape/apeproperties.h diff --git a/libs/taglib/taglib-2.0.2/taglib/ape/apetag.cpp b/3rdparty/taglib-2.0.2/taglib/ape/apetag.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ape/apetag.cpp rename to 3rdparty/taglib-2.0.2/taglib/ape/apetag.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/ape/apetag.h b/3rdparty/taglib-2.0.2/taglib/ape/apetag.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ape/apetag.h rename to 3rdparty/taglib-2.0.2/taglib/ape/apetag.h diff --git a/libs/taglib/taglib-2.0.2/taglib/asf/asfattribute.cpp b/3rdparty/taglib-2.0.2/taglib/asf/asfattribute.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/asf/asfattribute.cpp rename to 3rdparty/taglib-2.0.2/taglib/asf/asfattribute.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/asf/asfattribute.h b/3rdparty/taglib-2.0.2/taglib/asf/asfattribute.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/asf/asfattribute.h rename to 3rdparty/taglib-2.0.2/taglib/asf/asfattribute.h diff --git a/libs/taglib/taglib-2.0.2/taglib/asf/asffile.cpp b/3rdparty/taglib-2.0.2/taglib/asf/asffile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/asf/asffile.cpp rename to 3rdparty/taglib-2.0.2/taglib/asf/asffile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/asf/asffile.h b/3rdparty/taglib-2.0.2/taglib/asf/asffile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/asf/asffile.h rename to 3rdparty/taglib-2.0.2/taglib/asf/asffile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/asf/asfpicture.cpp b/3rdparty/taglib-2.0.2/taglib/asf/asfpicture.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/asf/asfpicture.cpp rename to 3rdparty/taglib-2.0.2/taglib/asf/asfpicture.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/asf/asfpicture.h b/3rdparty/taglib-2.0.2/taglib/asf/asfpicture.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/asf/asfpicture.h rename to 3rdparty/taglib-2.0.2/taglib/asf/asfpicture.h diff --git a/libs/taglib/taglib-2.0.2/taglib/asf/asfproperties.cpp b/3rdparty/taglib-2.0.2/taglib/asf/asfproperties.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/asf/asfproperties.cpp rename to 3rdparty/taglib-2.0.2/taglib/asf/asfproperties.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/asf/asfproperties.h b/3rdparty/taglib-2.0.2/taglib/asf/asfproperties.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/asf/asfproperties.h rename to 3rdparty/taglib-2.0.2/taglib/asf/asfproperties.h diff --git a/libs/taglib/taglib-2.0.2/taglib/asf/asftag.cpp b/3rdparty/taglib-2.0.2/taglib/asf/asftag.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/asf/asftag.cpp rename to 3rdparty/taglib-2.0.2/taglib/asf/asftag.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/asf/asftag.h b/3rdparty/taglib-2.0.2/taglib/asf/asftag.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/asf/asftag.h rename to 3rdparty/taglib-2.0.2/taglib/asf/asftag.h diff --git a/libs/taglib/taglib-2.0.2/taglib/asf/asfutils.h b/3rdparty/taglib-2.0.2/taglib/asf/asfutils.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/asf/asfutils.h rename to 3rdparty/taglib-2.0.2/taglib/asf/asfutils.h diff --git a/libs/taglib/taglib-2.0.2/taglib/audioproperties.cpp b/3rdparty/taglib-2.0.2/taglib/audioproperties.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/audioproperties.cpp rename to 3rdparty/taglib-2.0.2/taglib/audioproperties.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/audioproperties.h b/3rdparty/taglib-2.0.2/taglib/audioproperties.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/audioproperties.h rename to 3rdparty/taglib-2.0.2/taglib/audioproperties.h diff --git a/libs/taglib/taglib-2.0.2/taglib/dsdiff/dsdiffdiintag.cpp b/3rdparty/taglib-2.0.2/taglib/dsdiff/dsdiffdiintag.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/dsdiff/dsdiffdiintag.cpp rename to 3rdparty/taglib-2.0.2/taglib/dsdiff/dsdiffdiintag.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/dsdiff/dsdiffdiintag.h b/3rdparty/taglib-2.0.2/taglib/dsdiff/dsdiffdiintag.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/dsdiff/dsdiffdiintag.h rename to 3rdparty/taglib-2.0.2/taglib/dsdiff/dsdiffdiintag.h diff --git a/libs/taglib/taglib-2.0.2/taglib/dsdiff/dsdifffile.cpp b/3rdparty/taglib-2.0.2/taglib/dsdiff/dsdifffile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/dsdiff/dsdifffile.cpp rename to 3rdparty/taglib-2.0.2/taglib/dsdiff/dsdifffile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/dsdiff/dsdifffile.h b/3rdparty/taglib-2.0.2/taglib/dsdiff/dsdifffile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/dsdiff/dsdifffile.h rename to 3rdparty/taglib-2.0.2/taglib/dsdiff/dsdifffile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/dsdiff/dsdiffproperties.cpp b/3rdparty/taglib-2.0.2/taglib/dsdiff/dsdiffproperties.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/dsdiff/dsdiffproperties.cpp rename to 3rdparty/taglib-2.0.2/taglib/dsdiff/dsdiffproperties.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/dsdiff/dsdiffproperties.h b/3rdparty/taglib-2.0.2/taglib/dsdiff/dsdiffproperties.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/dsdiff/dsdiffproperties.h rename to 3rdparty/taglib-2.0.2/taglib/dsdiff/dsdiffproperties.h diff --git a/libs/taglib/taglib-2.0.2/taglib/dsf/dsffile.cpp b/3rdparty/taglib-2.0.2/taglib/dsf/dsffile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/dsf/dsffile.cpp rename to 3rdparty/taglib-2.0.2/taglib/dsf/dsffile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/dsf/dsffile.h b/3rdparty/taglib-2.0.2/taglib/dsf/dsffile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/dsf/dsffile.h rename to 3rdparty/taglib-2.0.2/taglib/dsf/dsffile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/dsf/dsfproperties.cpp b/3rdparty/taglib-2.0.2/taglib/dsf/dsfproperties.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/dsf/dsfproperties.cpp rename to 3rdparty/taglib-2.0.2/taglib/dsf/dsfproperties.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/dsf/dsfproperties.h b/3rdparty/taglib-2.0.2/taglib/dsf/dsfproperties.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/dsf/dsfproperties.h rename to 3rdparty/taglib-2.0.2/taglib/dsf/dsfproperties.h diff --git a/libs/taglib/taglib-2.0.2/taglib/fileref.cpp b/3rdparty/taglib-2.0.2/taglib/fileref.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/fileref.cpp rename to 3rdparty/taglib-2.0.2/taglib/fileref.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/fileref.h b/3rdparty/taglib-2.0.2/taglib/fileref.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/fileref.h rename to 3rdparty/taglib-2.0.2/taglib/fileref.h diff --git a/libs/taglib/taglib-2.0.2/taglib/flac/flacfile.cpp b/3rdparty/taglib-2.0.2/taglib/flac/flacfile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/flac/flacfile.cpp rename to 3rdparty/taglib-2.0.2/taglib/flac/flacfile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/flac/flacfile.h b/3rdparty/taglib-2.0.2/taglib/flac/flacfile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/flac/flacfile.h rename to 3rdparty/taglib-2.0.2/taglib/flac/flacfile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/flac/flacmetadatablock.cpp b/3rdparty/taglib-2.0.2/taglib/flac/flacmetadatablock.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/flac/flacmetadatablock.cpp rename to 3rdparty/taglib-2.0.2/taglib/flac/flacmetadatablock.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/flac/flacmetadatablock.h b/3rdparty/taglib-2.0.2/taglib/flac/flacmetadatablock.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/flac/flacmetadatablock.h rename to 3rdparty/taglib-2.0.2/taglib/flac/flacmetadatablock.h diff --git a/libs/taglib/taglib-2.0.2/taglib/flac/flacpicture.cpp b/3rdparty/taglib-2.0.2/taglib/flac/flacpicture.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/flac/flacpicture.cpp rename to 3rdparty/taglib-2.0.2/taglib/flac/flacpicture.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/flac/flacpicture.h b/3rdparty/taglib-2.0.2/taglib/flac/flacpicture.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/flac/flacpicture.h rename to 3rdparty/taglib-2.0.2/taglib/flac/flacpicture.h diff --git a/libs/taglib/taglib-2.0.2/taglib/flac/flacproperties.cpp b/3rdparty/taglib-2.0.2/taglib/flac/flacproperties.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/flac/flacproperties.cpp rename to 3rdparty/taglib-2.0.2/taglib/flac/flacproperties.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/flac/flacproperties.h b/3rdparty/taglib-2.0.2/taglib/flac/flacproperties.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/flac/flacproperties.h rename to 3rdparty/taglib-2.0.2/taglib/flac/flacproperties.h diff --git a/libs/taglib/taglib-2.0.2/taglib/flac/flacunknownmetadatablock.cpp b/3rdparty/taglib-2.0.2/taglib/flac/flacunknownmetadatablock.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/flac/flacunknownmetadatablock.cpp rename to 3rdparty/taglib-2.0.2/taglib/flac/flacunknownmetadatablock.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/flac/flacunknownmetadatablock.h b/3rdparty/taglib-2.0.2/taglib/flac/flacunknownmetadatablock.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/flac/flacunknownmetadatablock.h rename to 3rdparty/taglib-2.0.2/taglib/flac/flacunknownmetadatablock.h diff --git a/libs/taglib/taglib-2.0.2/taglib/it/itfile.cpp b/3rdparty/taglib-2.0.2/taglib/it/itfile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/it/itfile.cpp rename to 3rdparty/taglib-2.0.2/taglib/it/itfile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/it/itfile.h b/3rdparty/taglib-2.0.2/taglib/it/itfile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/it/itfile.h rename to 3rdparty/taglib-2.0.2/taglib/it/itfile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/it/itproperties.cpp b/3rdparty/taglib-2.0.2/taglib/it/itproperties.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/it/itproperties.cpp rename to 3rdparty/taglib-2.0.2/taglib/it/itproperties.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/it/itproperties.h b/3rdparty/taglib-2.0.2/taglib/it/itproperties.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/it/itproperties.h rename to 3rdparty/taglib-2.0.2/taglib/it/itproperties.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mod/modfile.cpp b/3rdparty/taglib-2.0.2/taglib/mod/modfile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mod/modfile.cpp rename to 3rdparty/taglib-2.0.2/taglib/mod/modfile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mod/modfile.h b/3rdparty/taglib-2.0.2/taglib/mod/modfile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mod/modfile.h rename to 3rdparty/taglib-2.0.2/taglib/mod/modfile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mod/modfilebase.cpp b/3rdparty/taglib-2.0.2/taglib/mod/modfilebase.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mod/modfilebase.cpp rename to 3rdparty/taglib-2.0.2/taglib/mod/modfilebase.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mod/modfilebase.h b/3rdparty/taglib-2.0.2/taglib/mod/modfilebase.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mod/modfilebase.h rename to 3rdparty/taglib-2.0.2/taglib/mod/modfilebase.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mod/modfileprivate.h b/3rdparty/taglib-2.0.2/taglib/mod/modfileprivate.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mod/modfileprivate.h rename to 3rdparty/taglib-2.0.2/taglib/mod/modfileprivate.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mod/modproperties.cpp b/3rdparty/taglib-2.0.2/taglib/mod/modproperties.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mod/modproperties.cpp rename to 3rdparty/taglib-2.0.2/taglib/mod/modproperties.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mod/modproperties.h b/3rdparty/taglib-2.0.2/taglib/mod/modproperties.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mod/modproperties.h rename to 3rdparty/taglib-2.0.2/taglib/mod/modproperties.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mod/modtag.cpp b/3rdparty/taglib-2.0.2/taglib/mod/modtag.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mod/modtag.cpp rename to 3rdparty/taglib-2.0.2/taglib/mod/modtag.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mod/modtag.h b/3rdparty/taglib-2.0.2/taglib/mod/modtag.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mod/modtag.h rename to 3rdparty/taglib-2.0.2/taglib/mod/modtag.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mp4/mp4atom.cpp b/3rdparty/taglib-2.0.2/taglib/mp4/mp4atom.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mp4/mp4atom.cpp rename to 3rdparty/taglib-2.0.2/taglib/mp4/mp4atom.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mp4/mp4atom.h b/3rdparty/taglib-2.0.2/taglib/mp4/mp4atom.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mp4/mp4atom.h rename to 3rdparty/taglib-2.0.2/taglib/mp4/mp4atom.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mp4/mp4coverart.cpp b/3rdparty/taglib-2.0.2/taglib/mp4/mp4coverart.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mp4/mp4coverart.cpp rename to 3rdparty/taglib-2.0.2/taglib/mp4/mp4coverart.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mp4/mp4coverart.h b/3rdparty/taglib-2.0.2/taglib/mp4/mp4coverart.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mp4/mp4coverart.h rename to 3rdparty/taglib-2.0.2/taglib/mp4/mp4coverart.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mp4/mp4file.cpp b/3rdparty/taglib-2.0.2/taglib/mp4/mp4file.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mp4/mp4file.cpp rename to 3rdparty/taglib-2.0.2/taglib/mp4/mp4file.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mp4/mp4file.h b/3rdparty/taglib-2.0.2/taglib/mp4/mp4file.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mp4/mp4file.h rename to 3rdparty/taglib-2.0.2/taglib/mp4/mp4file.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mp4/mp4item.cpp b/3rdparty/taglib-2.0.2/taglib/mp4/mp4item.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mp4/mp4item.cpp rename to 3rdparty/taglib-2.0.2/taglib/mp4/mp4item.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mp4/mp4item.h b/3rdparty/taglib-2.0.2/taglib/mp4/mp4item.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mp4/mp4item.h rename to 3rdparty/taglib-2.0.2/taglib/mp4/mp4item.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mp4/mp4itemfactory.cpp b/3rdparty/taglib-2.0.2/taglib/mp4/mp4itemfactory.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mp4/mp4itemfactory.cpp rename to 3rdparty/taglib-2.0.2/taglib/mp4/mp4itemfactory.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mp4/mp4itemfactory.h b/3rdparty/taglib-2.0.2/taglib/mp4/mp4itemfactory.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mp4/mp4itemfactory.h rename to 3rdparty/taglib-2.0.2/taglib/mp4/mp4itemfactory.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mp4/mp4properties.cpp b/3rdparty/taglib-2.0.2/taglib/mp4/mp4properties.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mp4/mp4properties.cpp rename to 3rdparty/taglib-2.0.2/taglib/mp4/mp4properties.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mp4/mp4properties.h b/3rdparty/taglib-2.0.2/taglib/mp4/mp4properties.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mp4/mp4properties.h rename to 3rdparty/taglib-2.0.2/taglib/mp4/mp4properties.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mp4/mp4tag.cpp b/3rdparty/taglib-2.0.2/taglib/mp4/mp4tag.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mp4/mp4tag.cpp rename to 3rdparty/taglib-2.0.2/taglib/mp4/mp4tag.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mp4/mp4tag.h b/3rdparty/taglib-2.0.2/taglib/mp4/mp4tag.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mp4/mp4tag.h rename to 3rdparty/taglib-2.0.2/taglib/mp4/mp4tag.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpc/mpcfile.cpp b/3rdparty/taglib-2.0.2/taglib/mpc/mpcfile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpc/mpcfile.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpc/mpcfile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpc/mpcfile.h b/3rdparty/taglib-2.0.2/taglib/mpc/mpcfile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpc/mpcfile.h rename to 3rdparty/taglib-2.0.2/taglib/mpc/mpcfile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpc/mpcproperties.cpp b/3rdparty/taglib-2.0.2/taglib/mpc/mpcproperties.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpc/mpcproperties.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpc/mpcproperties.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpc/mpcproperties.h b/3rdparty/taglib-2.0.2/taglib/mpc/mpcproperties.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpc/mpcproperties.h rename to 3rdparty/taglib-2.0.2/taglib/mpc/mpcproperties.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v1/id3v1genres.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v1/id3v1genres.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v1/id3v1genres.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v1/id3v1genres.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v1/id3v1genres.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v1/id3v1genres.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v1/id3v1genres.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v1/id3v1genres.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v1/id3v1tag.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v1/id3v1tag.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v1/id3v1tag.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v1/id3v1tag.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v1/id3v1tag.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v1/id3v1tag.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v1/id3v1tag.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v1/id3v1tag.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/attachedpictureframe.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/attachedpictureframe.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/attachedpictureframe.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/attachedpictureframe.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/chapterframe.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/chapterframe.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/chapterframe.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/chapterframe.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/chapterframe.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/chapterframe.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/chapterframe.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/chapterframe.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/commentsframe.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/commentsframe.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/commentsframe.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/commentsframe.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/commentsframe.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/commentsframe.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/commentsframe.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/commentsframe.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/ownershipframe.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/ownershipframe.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/ownershipframe.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/ownershipframe.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/ownershipframe.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/ownershipframe.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/ownershipframe.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/ownershipframe.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/podcastframe.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/podcastframe.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/podcastframe.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/podcastframe.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/podcastframe.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/podcastframe.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/podcastframe.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/podcastframe.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/popularimeterframe.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/popularimeterframe.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/popularimeterframe.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/popularimeterframe.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/popularimeterframe.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/popularimeterframe.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/popularimeterframe.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/popularimeterframe.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/privateframe.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/privateframe.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/privateframe.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/privateframe.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/privateframe.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/privateframe.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/privateframe.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/privateframe.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/relativevolumeframe.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/relativevolumeframe.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/relativevolumeframe.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/relativevolumeframe.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/tableofcontentsframe.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/tableofcontentsframe.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/tableofcontentsframe.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/tableofcontentsframe.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/textidentificationframe.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/textidentificationframe.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/textidentificationframe.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/textidentificationframe.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/textidentificationframe.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/textidentificationframe.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/textidentificationframe.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/textidentificationframe.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/unknownframe.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/unknownframe.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/unknownframe.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/unknownframe.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/unknownframe.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/unknownframe.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/unknownframe.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/unknownframe.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/urllinkframe.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/urllinkframe.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/urllinkframe.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/urllinkframe.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/urllinkframe.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/urllinkframe.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/frames/urllinkframe.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/frames/urllinkframe.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2.2.0.txt b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2.2.0.txt similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2.2.0.txt rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2.2.0.txt diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2.3.0.txt b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2.3.0.txt similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2.3.0.txt rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2.3.0.txt diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2.4.0-frames.txt b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2.4.0-frames.txt similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2.4.0-frames.txt rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2.4.0-frames.txt diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2.4.0-structure.txt b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2.4.0-structure.txt similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2.4.0-structure.txt rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2.4.0-structure.txt diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2extendedheader.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2extendedheader.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2extendedheader.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2extendedheader.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2extendedheader.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2extendedheader.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2extendedheader.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2extendedheader.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2footer.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2footer.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2footer.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2footer.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2footer.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2footer.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2footer.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2footer.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2frame.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2frame.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2frame.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2frame.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2frame.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2frame.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2frame.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2frame.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2framefactory.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2framefactory.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2framefactory.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2framefactory.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2framefactory.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2framefactory.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2framefactory.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2framefactory.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2header.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2header.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2header.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2header.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2header.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2header.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2header.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2header.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2synchdata.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2synchdata.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2synchdata.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2synchdata.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2synchdata.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2synchdata.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2synchdata.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2synchdata.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2tag.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2tag.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2tag.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2tag.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2tag.h b/3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2tag.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2/id3v2tag.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/id3v2/id3v2tag.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/mpegfile.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/mpegfile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/mpegfile.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/mpegfile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/mpegfile.h b/3rdparty/taglib-2.0.2/taglib/mpeg/mpegfile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/mpegfile.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/mpegfile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/mpegheader.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/mpegheader.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/mpegheader.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/mpegheader.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/mpegheader.h b/3rdparty/taglib-2.0.2/taglib/mpeg/mpegheader.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/mpegheader.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/mpegheader.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/mpegproperties.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/mpegproperties.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/mpegproperties.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/mpegproperties.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/mpegproperties.h b/3rdparty/taglib-2.0.2/taglib/mpeg/mpegproperties.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/mpegproperties.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/mpegproperties.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/mpegutils.h b/3rdparty/taglib-2.0.2/taglib/mpeg/mpegutils.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/mpegutils.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/mpegutils.h diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/xingheader.cpp b/3rdparty/taglib-2.0.2/taglib/mpeg/xingheader.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/xingheader.cpp rename to 3rdparty/taglib-2.0.2/taglib/mpeg/xingheader.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/mpeg/xingheader.h b/3rdparty/taglib-2.0.2/taglib/mpeg/xingheader.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/mpeg/xingheader.h rename to 3rdparty/taglib-2.0.2/taglib/mpeg/xingheader.h diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/flac/oggflacfile.cpp b/3rdparty/taglib-2.0.2/taglib/ogg/flac/oggflacfile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/flac/oggflacfile.cpp rename to 3rdparty/taglib-2.0.2/taglib/ogg/flac/oggflacfile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/flac/oggflacfile.h b/3rdparty/taglib-2.0.2/taglib/ogg/flac/oggflacfile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/flac/oggflacfile.h rename to 3rdparty/taglib-2.0.2/taglib/ogg/flac/oggflacfile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/oggfile.cpp b/3rdparty/taglib-2.0.2/taglib/ogg/oggfile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/oggfile.cpp rename to 3rdparty/taglib-2.0.2/taglib/ogg/oggfile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/oggfile.h b/3rdparty/taglib-2.0.2/taglib/ogg/oggfile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/oggfile.h rename to 3rdparty/taglib-2.0.2/taglib/ogg/oggfile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/oggpage.cpp b/3rdparty/taglib-2.0.2/taglib/ogg/oggpage.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/oggpage.cpp rename to 3rdparty/taglib-2.0.2/taglib/ogg/oggpage.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/oggpage.h b/3rdparty/taglib-2.0.2/taglib/ogg/oggpage.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/oggpage.h rename to 3rdparty/taglib-2.0.2/taglib/ogg/oggpage.h diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/oggpageheader.cpp b/3rdparty/taglib-2.0.2/taglib/ogg/oggpageheader.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/oggpageheader.cpp rename to 3rdparty/taglib-2.0.2/taglib/ogg/oggpageheader.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/oggpageheader.h b/3rdparty/taglib-2.0.2/taglib/ogg/oggpageheader.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/oggpageheader.h rename to 3rdparty/taglib-2.0.2/taglib/ogg/oggpageheader.h diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/opus/opusfile.cpp b/3rdparty/taglib-2.0.2/taglib/ogg/opus/opusfile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/opus/opusfile.cpp rename to 3rdparty/taglib-2.0.2/taglib/ogg/opus/opusfile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/opus/opusfile.h b/3rdparty/taglib-2.0.2/taglib/ogg/opus/opusfile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/opus/opusfile.h rename to 3rdparty/taglib-2.0.2/taglib/ogg/opus/opusfile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/opus/opusproperties.cpp b/3rdparty/taglib-2.0.2/taglib/ogg/opus/opusproperties.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/opus/opusproperties.cpp rename to 3rdparty/taglib-2.0.2/taglib/ogg/opus/opusproperties.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/opus/opusproperties.h b/3rdparty/taglib-2.0.2/taglib/ogg/opus/opusproperties.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/opus/opusproperties.h rename to 3rdparty/taglib-2.0.2/taglib/ogg/opus/opusproperties.h diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/speex/speexfile.cpp b/3rdparty/taglib-2.0.2/taglib/ogg/speex/speexfile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/speex/speexfile.cpp rename to 3rdparty/taglib-2.0.2/taglib/ogg/speex/speexfile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/speex/speexfile.h b/3rdparty/taglib-2.0.2/taglib/ogg/speex/speexfile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/speex/speexfile.h rename to 3rdparty/taglib-2.0.2/taglib/ogg/speex/speexfile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/speex/speexproperties.cpp b/3rdparty/taglib-2.0.2/taglib/ogg/speex/speexproperties.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/speex/speexproperties.cpp rename to 3rdparty/taglib-2.0.2/taglib/ogg/speex/speexproperties.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/speex/speexproperties.h b/3rdparty/taglib-2.0.2/taglib/ogg/speex/speexproperties.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/speex/speexproperties.h rename to 3rdparty/taglib-2.0.2/taglib/ogg/speex/speexproperties.h diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/vorbis/vorbisfile.cpp b/3rdparty/taglib-2.0.2/taglib/ogg/vorbis/vorbisfile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/vorbis/vorbisfile.cpp rename to 3rdparty/taglib-2.0.2/taglib/ogg/vorbis/vorbisfile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/vorbis/vorbisfile.h b/3rdparty/taglib-2.0.2/taglib/ogg/vorbis/vorbisfile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/vorbis/vorbisfile.h rename to 3rdparty/taglib-2.0.2/taglib/ogg/vorbis/vorbisfile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/vorbis/vorbisproperties.cpp b/3rdparty/taglib-2.0.2/taglib/ogg/vorbis/vorbisproperties.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/vorbis/vorbisproperties.cpp rename to 3rdparty/taglib-2.0.2/taglib/ogg/vorbis/vorbisproperties.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/vorbis/vorbisproperties.h b/3rdparty/taglib-2.0.2/taglib/ogg/vorbis/vorbisproperties.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/vorbis/vorbisproperties.h rename to 3rdparty/taglib-2.0.2/taglib/ogg/vorbis/vorbisproperties.h diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/xiphcomment.cpp b/3rdparty/taglib-2.0.2/taglib/ogg/xiphcomment.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/xiphcomment.cpp rename to 3rdparty/taglib-2.0.2/taglib/ogg/xiphcomment.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/ogg/xiphcomment.h b/3rdparty/taglib-2.0.2/taglib/ogg/xiphcomment.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/ogg/xiphcomment.h rename to 3rdparty/taglib-2.0.2/taglib/ogg/xiphcomment.h diff --git a/libs/taglib/taglib-2.0.2/taglib/riff/aiff/aifffile.cpp b/3rdparty/taglib-2.0.2/taglib/riff/aiff/aifffile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/riff/aiff/aifffile.cpp rename to 3rdparty/taglib-2.0.2/taglib/riff/aiff/aifffile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/riff/aiff/aifffile.h b/3rdparty/taglib-2.0.2/taglib/riff/aiff/aifffile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/riff/aiff/aifffile.h rename to 3rdparty/taglib-2.0.2/taglib/riff/aiff/aifffile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/riff/aiff/aiffproperties.cpp b/3rdparty/taglib-2.0.2/taglib/riff/aiff/aiffproperties.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/riff/aiff/aiffproperties.cpp rename to 3rdparty/taglib-2.0.2/taglib/riff/aiff/aiffproperties.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/riff/aiff/aiffproperties.h b/3rdparty/taglib-2.0.2/taglib/riff/aiff/aiffproperties.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/riff/aiff/aiffproperties.h rename to 3rdparty/taglib-2.0.2/taglib/riff/aiff/aiffproperties.h diff --git a/libs/taglib/taglib-2.0.2/taglib/riff/rifffile.cpp b/3rdparty/taglib-2.0.2/taglib/riff/rifffile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/riff/rifffile.cpp rename to 3rdparty/taglib-2.0.2/taglib/riff/rifffile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/riff/rifffile.h b/3rdparty/taglib-2.0.2/taglib/riff/rifffile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/riff/rifffile.h rename to 3rdparty/taglib-2.0.2/taglib/riff/rifffile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/riff/riffutils.h b/3rdparty/taglib-2.0.2/taglib/riff/riffutils.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/riff/riffutils.h rename to 3rdparty/taglib-2.0.2/taglib/riff/riffutils.h diff --git a/libs/taglib/taglib-2.0.2/taglib/riff/wav/infotag.cpp b/3rdparty/taglib-2.0.2/taglib/riff/wav/infotag.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/riff/wav/infotag.cpp rename to 3rdparty/taglib-2.0.2/taglib/riff/wav/infotag.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/riff/wav/infotag.h b/3rdparty/taglib-2.0.2/taglib/riff/wav/infotag.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/riff/wav/infotag.h rename to 3rdparty/taglib-2.0.2/taglib/riff/wav/infotag.h diff --git a/libs/taglib/taglib-2.0.2/taglib/riff/wav/wavfile.cpp b/3rdparty/taglib-2.0.2/taglib/riff/wav/wavfile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/riff/wav/wavfile.cpp rename to 3rdparty/taglib-2.0.2/taglib/riff/wav/wavfile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/riff/wav/wavfile.h b/3rdparty/taglib-2.0.2/taglib/riff/wav/wavfile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/riff/wav/wavfile.h rename to 3rdparty/taglib-2.0.2/taglib/riff/wav/wavfile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/riff/wav/wavproperties.cpp b/3rdparty/taglib-2.0.2/taglib/riff/wav/wavproperties.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/riff/wav/wavproperties.cpp rename to 3rdparty/taglib-2.0.2/taglib/riff/wav/wavproperties.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/riff/wav/wavproperties.h b/3rdparty/taglib-2.0.2/taglib/riff/wav/wavproperties.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/riff/wav/wavproperties.h rename to 3rdparty/taglib-2.0.2/taglib/riff/wav/wavproperties.h diff --git a/libs/taglib/taglib-2.0.2/taglib/s3m/s3mfile.cpp b/3rdparty/taglib-2.0.2/taglib/s3m/s3mfile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/s3m/s3mfile.cpp rename to 3rdparty/taglib-2.0.2/taglib/s3m/s3mfile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/s3m/s3mfile.h b/3rdparty/taglib-2.0.2/taglib/s3m/s3mfile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/s3m/s3mfile.h rename to 3rdparty/taglib-2.0.2/taglib/s3m/s3mfile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/s3m/s3mproperties.cpp b/3rdparty/taglib-2.0.2/taglib/s3m/s3mproperties.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/s3m/s3mproperties.cpp rename to 3rdparty/taglib-2.0.2/taglib/s3m/s3mproperties.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/s3m/s3mproperties.h b/3rdparty/taglib-2.0.2/taglib/s3m/s3mproperties.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/s3m/s3mproperties.h rename to 3rdparty/taglib-2.0.2/taglib/s3m/s3mproperties.h diff --git a/libs/taglib/taglib-2.0.2/taglib/tag.cpp b/3rdparty/taglib-2.0.2/taglib/tag.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/tag.cpp rename to 3rdparty/taglib-2.0.2/taglib/tag.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/tag.h b/3rdparty/taglib-2.0.2/taglib/tag.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/tag.h rename to 3rdparty/taglib-2.0.2/taglib/tag.h diff --git a/libs/taglib/taglib-2.0.2/taglib/taglib_export.h b/3rdparty/taglib-2.0.2/taglib/taglib_export.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/taglib_export.h rename to 3rdparty/taglib-2.0.2/taglib/taglib_export.h diff --git a/libs/taglib/taglib-2.0.2/taglib/tagunion.cpp b/3rdparty/taglib-2.0.2/taglib/tagunion.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/tagunion.cpp rename to 3rdparty/taglib-2.0.2/taglib/tagunion.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/tagunion.h b/3rdparty/taglib-2.0.2/taglib/tagunion.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/tagunion.h rename to 3rdparty/taglib-2.0.2/taglib/tagunion.h diff --git a/libs/taglib/taglib-2.0.2/taglib/tagutils.cpp b/3rdparty/taglib-2.0.2/taglib/tagutils.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/tagutils.cpp rename to 3rdparty/taglib-2.0.2/taglib/tagutils.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/tagutils.h b/3rdparty/taglib-2.0.2/taglib/tagutils.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/tagutils.h rename to 3rdparty/taglib-2.0.2/taglib/tagutils.h diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/propertymapping.dox b/3rdparty/taglib-2.0.2/taglib/toolkit/propertymapping.dox similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/propertymapping.dox rename to 3rdparty/taglib-2.0.2/taglib/toolkit/propertymapping.dox diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/taglib.h b/3rdparty/taglib-2.0.2/taglib/toolkit/taglib.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/taglib.h rename to 3rdparty/taglib-2.0.2/taglib/toolkit/taglib.h diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tbytevector.cpp b/3rdparty/taglib-2.0.2/taglib/toolkit/tbytevector.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tbytevector.cpp rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tbytevector.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tbytevector.h b/3rdparty/taglib-2.0.2/taglib/toolkit/tbytevector.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tbytevector.h rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tbytevector.h diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tbytevectorlist.cpp b/3rdparty/taglib-2.0.2/taglib/toolkit/tbytevectorlist.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tbytevectorlist.cpp rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tbytevectorlist.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tbytevectorlist.h b/3rdparty/taglib-2.0.2/taglib/toolkit/tbytevectorlist.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tbytevectorlist.h rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tbytevectorlist.h diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tbytevectorstream.cpp b/3rdparty/taglib-2.0.2/taglib/toolkit/tbytevectorstream.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tbytevectorstream.cpp rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tbytevectorstream.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tbytevectorstream.h b/3rdparty/taglib-2.0.2/taglib/toolkit/tbytevectorstream.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tbytevectorstream.h rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tbytevectorstream.h diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tdebug.cpp b/3rdparty/taglib-2.0.2/taglib/toolkit/tdebug.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tdebug.cpp rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tdebug.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tdebug.h b/3rdparty/taglib-2.0.2/taglib/toolkit/tdebug.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tdebug.h rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tdebug.h diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tdebuglistener.cpp b/3rdparty/taglib-2.0.2/taglib/toolkit/tdebuglistener.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tdebuglistener.cpp rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tdebuglistener.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tdebuglistener.h b/3rdparty/taglib-2.0.2/taglib/toolkit/tdebuglistener.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tdebuglistener.h rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tdebuglistener.h diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tfile.cpp b/3rdparty/taglib-2.0.2/taglib/toolkit/tfile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tfile.cpp rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tfile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tfile.h b/3rdparty/taglib-2.0.2/taglib/toolkit/tfile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tfile.h rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tfile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tfilestream.cpp b/3rdparty/taglib-2.0.2/taglib/toolkit/tfilestream.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tfilestream.cpp rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tfilestream.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tfilestream.h b/3rdparty/taglib-2.0.2/taglib/toolkit/tfilestream.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tfilestream.h rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tfilestream.h diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tiostream.cpp b/3rdparty/taglib-2.0.2/taglib/toolkit/tiostream.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tiostream.cpp rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tiostream.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tiostream.h b/3rdparty/taglib-2.0.2/taglib/toolkit/tiostream.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tiostream.h rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tiostream.h diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tlist.h b/3rdparty/taglib-2.0.2/taglib/toolkit/tlist.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tlist.h rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tlist.h diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tlist.tcc b/3rdparty/taglib-2.0.2/taglib/toolkit/tlist.tcc similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tlist.tcc rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tlist.tcc diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tmap.h b/3rdparty/taglib-2.0.2/taglib/toolkit/tmap.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tmap.h rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tmap.h diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tmap.tcc b/3rdparty/taglib-2.0.2/taglib/toolkit/tmap.tcc similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tmap.tcc rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tmap.tcc diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tpicturetype.cpp b/3rdparty/taglib-2.0.2/taglib/toolkit/tpicturetype.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tpicturetype.cpp rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tpicturetype.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tpicturetype.h b/3rdparty/taglib-2.0.2/taglib/toolkit/tpicturetype.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tpicturetype.h rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tpicturetype.h diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tpropertymap.cpp b/3rdparty/taglib-2.0.2/taglib/toolkit/tpropertymap.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tpropertymap.cpp rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tpropertymap.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tpropertymap.h b/3rdparty/taglib-2.0.2/taglib/toolkit/tpropertymap.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tpropertymap.h rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tpropertymap.h diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tstring.cpp b/3rdparty/taglib-2.0.2/taglib/toolkit/tstring.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tstring.cpp rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tstring.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tstring.h b/3rdparty/taglib-2.0.2/taglib/toolkit/tstring.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tstring.h rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tstring.h diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tstringlist.cpp b/3rdparty/taglib-2.0.2/taglib/toolkit/tstringlist.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tstringlist.cpp rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tstringlist.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tstringlist.h b/3rdparty/taglib-2.0.2/taglib/toolkit/tstringlist.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tstringlist.h rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tstringlist.h diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tutils.h b/3rdparty/taglib-2.0.2/taglib/toolkit/tutils.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tutils.h rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tutils.h diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tvariant.cpp b/3rdparty/taglib-2.0.2/taglib/toolkit/tvariant.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tvariant.cpp rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tvariant.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tvariant.h b/3rdparty/taglib-2.0.2/taglib/toolkit/tvariant.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tvariant.h rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tvariant.h diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tversionnumber.cpp b/3rdparty/taglib-2.0.2/taglib/toolkit/tversionnumber.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tversionnumber.cpp rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tversionnumber.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tversionnumber.h b/3rdparty/taglib-2.0.2/taglib/toolkit/tversionnumber.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tversionnumber.h rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tversionnumber.h diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tzlib.cpp b/3rdparty/taglib-2.0.2/taglib/toolkit/tzlib.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tzlib.cpp rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tzlib.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/toolkit/tzlib.h b/3rdparty/taglib-2.0.2/taglib/toolkit/tzlib.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/toolkit/tzlib.h rename to 3rdparty/taglib-2.0.2/taglib/toolkit/tzlib.h diff --git a/libs/taglib/taglib-2.0.2/taglib/trueaudio/trueaudiofile.cpp b/3rdparty/taglib-2.0.2/taglib/trueaudio/trueaudiofile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/trueaudio/trueaudiofile.cpp rename to 3rdparty/taglib-2.0.2/taglib/trueaudio/trueaudiofile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/trueaudio/trueaudiofile.h b/3rdparty/taglib-2.0.2/taglib/trueaudio/trueaudiofile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/trueaudio/trueaudiofile.h rename to 3rdparty/taglib-2.0.2/taglib/trueaudio/trueaudiofile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/trueaudio/trueaudioproperties.cpp b/3rdparty/taglib-2.0.2/taglib/trueaudio/trueaudioproperties.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/trueaudio/trueaudioproperties.cpp rename to 3rdparty/taglib-2.0.2/taglib/trueaudio/trueaudioproperties.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/trueaudio/trueaudioproperties.h b/3rdparty/taglib-2.0.2/taglib/trueaudio/trueaudioproperties.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/trueaudio/trueaudioproperties.h rename to 3rdparty/taglib-2.0.2/taglib/trueaudio/trueaudioproperties.h diff --git a/libs/taglib/taglib-2.0.2/taglib/wavpack/wavpackfile.cpp b/3rdparty/taglib-2.0.2/taglib/wavpack/wavpackfile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/wavpack/wavpackfile.cpp rename to 3rdparty/taglib-2.0.2/taglib/wavpack/wavpackfile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/wavpack/wavpackfile.h b/3rdparty/taglib-2.0.2/taglib/wavpack/wavpackfile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/wavpack/wavpackfile.h rename to 3rdparty/taglib-2.0.2/taglib/wavpack/wavpackfile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/wavpack/wavpackproperties.cpp b/3rdparty/taglib-2.0.2/taglib/wavpack/wavpackproperties.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/wavpack/wavpackproperties.cpp rename to 3rdparty/taglib-2.0.2/taglib/wavpack/wavpackproperties.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/wavpack/wavpackproperties.h b/3rdparty/taglib-2.0.2/taglib/wavpack/wavpackproperties.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/wavpack/wavpackproperties.h rename to 3rdparty/taglib-2.0.2/taglib/wavpack/wavpackproperties.h diff --git a/libs/taglib/taglib-2.0.2/taglib/xm/xmfile.cpp b/3rdparty/taglib-2.0.2/taglib/xm/xmfile.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/xm/xmfile.cpp rename to 3rdparty/taglib-2.0.2/taglib/xm/xmfile.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/xm/xmfile.h b/3rdparty/taglib-2.0.2/taglib/xm/xmfile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/xm/xmfile.h rename to 3rdparty/taglib-2.0.2/taglib/xm/xmfile.h diff --git a/libs/taglib/taglib-2.0.2/taglib/xm/xmproperties.cpp b/3rdparty/taglib-2.0.2/taglib/xm/xmproperties.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/xm/xmproperties.cpp rename to 3rdparty/taglib-2.0.2/taglib/xm/xmproperties.cpp diff --git a/libs/taglib/taglib-2.0.2/taglib/xm/xmproperties.h b/3rdparty/taglib-2.0.2/taglib/xm/xmproperties.h similarity index 100% rename from libs/taglib/taglib-2.0.2/taglib/xm/xmproperties.h rename to 3rdparty/taglib-2.0.2/taglib/xm/xmproperties.h diff --git a/libs/taglib/taglib-2.0.2/tests/CMakeLists.txt b/3rdparty/taglib-2.0.2/tests/CMakeLists.txt similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/CMakeLists.txt rename to 3rdparty/taglib-2.0.2/tests/CMakeLists.txt diff --git a/libs/taglib/taglib-2.0.2/tests/data/005411.id3 b/3rdparty/taglib-2.0.2/tests/data/005411.id3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/005411.id3 rename to 3rdparty/taglib-2.0.2/tests/data/005411.id3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/64bit.mp4 b/3rdparty/taglib-2.0.2/tests/data/64bit.mp4 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/64bit.mp4 rename to 3rdparty/taglib-2.0.2/tests/data/64bit.mp4 diff --git a/libs/taglib/taglib-2.0.2/tests/data/alaw.aifc b/3rdparty/taglib-2.0.2/tests/data/alaw.aifc similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/alaw.aifc rename to 3rdparty/taglib-2.0.2/tests/data/alaw.aifc diff --git a/libs/taglib/taglib-2.0.2/tests/data/alaw.wav b/3rdparty/taglib-2.0.2/tests/data/alaw.wav similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/alaw.wav rename to 3rdparty/taglib-2.0.2/tests/data/alaw.wav diff --git a/libs/taglib/taglib-2.0.2/tests/data/ape-id3v1.mp3 b/3rdparty/taglib-2.0.2/tests/data/ape-id3v1.mp3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/ape-id3v1.mp3 rename to 3rdparty/taglib-2.0.2/tests/data/ape-id3v1.mp3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/ape-id3v2.mp3 b/3rdparty/taglib-2.0.2/tests/data/ape-id3v2.mp3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/ape-id3v2.mp3 rename to 3rdparty/taglib-2.0.2/tests/data/ape-id3v2.mp3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/ape.mp3 b/3rdparty/taglib-2.0.2/tests/data/ape.mp3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/ape.mp3 rename to 3rdparty/taglib-2.0.2/tests/data/ape.mp3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/bladeenc.mp3 b/3rdparty/taglib-2.0.2/tests/data/bladeenc.mp3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/bladeenc.mp3 rename to 3rdparty/taglib-2.0.2/tests/data/bladeenc.mp3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/blank_video.m4v b/3rdparty/taglib-2.0.2/tests/data/blank_video.m4v similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/blank_video.m4v rename to 3rdparty/taglib-2.0.2/tests/data/blank_video.m4v diff --git a/libs/taglib/taglib-2.0.2/tests/data/broken-tenc.id3 b/3rdparty/taglib-2.0.2/tests/data/broken-tenc.id3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/broken-tenc.id3 rename to 3rdparty/taglib-2.0.2/tests/data/broken-tenc.id3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/changed.mod b/3rdparty/taglib-2.0.2/tests/data/changed.mod similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/changed.mod rename to 3rdparty/taglib-2.0.2/tests/data/changed.mod diff --git a/libs/taglib/taglib-2.0.2/tests/data/changed.s3m b/3rdparty/taglib-2.0.2/tests/data/changed.s3m similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/changed.s3m rename to 3rdparty/taglib-2.0.2/tests/data/changed.s3m diff --git a/libs/taglib/taglib-2.0.2/tests/data/changed.xm b/3rdparty/taglib-2.0.2/tests/data/changed.xm similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/changed.xm rename to 3rdparty/taglib-2.0.2/tests/data/changed.xm diff --git a/libs/taglib/taglib-2.0.2/tests/data/click.mpc b/3rdparty/taglib-2.0.2/tests/data/click.mpc similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/click.mpc rename to 3rdparty/taglib-2.0.2/tests/data/click.mpc diff --git a/libs/taglib/taglib-2.0.2/tests/data/click.wv b/3rdparty/taglib-2.0.2/tests/data/click.wv similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/click.wv rename to 3rdparty/taglib-2.0.2/tests/data/click.wv diff --git a/libs/taglib/taglib-2.0.2/tests/data/compressed_id3_frame.mp3 b/3rdparty/taglib-2.0.2/tests/data/compressed_id3_frame.mp3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/compressed_id3_frame.mp3 rename to 3rdparty/taglib-2.0.2/tests/data/compressed_id3_frame.mp3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/correctness_gain_silent_output.opus b/3rdparty/taglib-2.0.2/tests/data/correctness_gain_silent_output.opus similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/correctness_gain_silent_output.opus rename to 3rdparty/taglib-2.0.2/tests/data/correctness_gain_silent_output.opus diff --git a/libs/taglib/taglib-2.0.2/tests/data/covr-junk.m4a b/3rdparty/taglib-2.0.2/tests/data/covr-junk.m4a similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/covr-junk.m4a rename to 3rdparty/taglib-2.0.2/tests/data/covr-junk.m4a diff --git a/libs/taglib/taglib-2.0.2/tests/data/dsd_stereo.wv b/3rdparty/taglib-2.0.2/tests/data/dsd_stereo.wv similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/dsd_stereo.wv rename to 3rdparty/taglib-2.0.2/tests/data/dsd_stereo.wv diff --git a/libs/taglib/taglib-2.0.2/tests/data/duplicate_id3v2.aiff b/3rdparty/taglib-2.0.2/tests/data/duplicate_id3v2.aiff similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/duplicate_id3v2.aiff rename to 3rdparty/taglib-2.0.2/tests/data/duplicate_id3v2.aiff diff --git a/libs/taglib/taglib-2.0.2/tests/data/duplicate_id3v2.mp3 b/3rdparty/taglib-2.0.2/tests/data/duplicate_id3v2.mp3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/duplicate_id3v2.mp3 rename to 3rdparty/taglib-2.0.2/tests/data/duplicate_id3v2.mp3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/duplicate_tags.wav b/3rdparty/taglib-2.0.2/tests/data/duplicate_tags.wav similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/duplicate_tags.wav rename to 3rdparty/taglib-2.0.2/tests/data/duplicate_tags.wav diff --git a/libs/taglib/taglib-2.0.2/tests/data/empty-seektable.flac b/3rdparty/taglib-2.0.2/tests/data/empty-seektable.flac similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/empty-seektable.flac rename to 3rdparty/taglib-2.0.2/tests/data/empty-seektable.flac diff --git a/libs/taglib/taglib-2.0.2/tests/data/empty.aiff b/3rdparty/taglib-2.0.2/tests/data/empty.aiff similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/empty.aiff rename to 3rdparty/taglib-2.0.2/tests/data/empty.aiff diff --git a/libs/taglib/taglib-2.0.2/tests/data/empty.ogg b/3rdparty/taglib-2.0.2/tests/data/empty.ogg similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/empty.ogg rename to 3rdparty/taglib-2.0.2/tests/data/empty.ogg diff --git a/libs/taglib/taglib-2.0.2/tests/data/empty.spx b/3rdparty/taglib-2.0.2/tests/data/empty.spx similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/empty.spx rename to 3rdparty/taglib-2.0.2/tests/data/empty.spx diff --git a/libs/taglib/taglib-2.0.2/tests/data/empty.tta b/3rdparty/taglib-2.0.2/tests/data/empty.tta similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/empty.tta rename to 3rdparty/taglib-2.0.2/tests/data/empty.tta diff --git a/libs/taglib/taglib-2.0.2/tests/data/empty.wav b/3rdparty/taglib-2.0.2/tests/data/empty.wav similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/empty.wav rename to 3rdparty/taglib-2.0.2/tests/data/empty.wav diff --git a/libs/taglib/taglib-2.0.2/tests/data/empty10ms.dff b/3rdparty/taglib-2.0.2/tests/data/empty10ms.dff similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/empty10ms.dff rename to 3rdparty/taglib-2.0.2/tests/data/empty10ms.dff diff --git a/libs/taglib/taglib-2.0.2/tests/data/empty10ms.dsf b/3rdparty/taglib-2.0.2/tests/data/empty10ms.dsf similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/empty10ms.dsf rename to 3rdparty/taglib-2.0.2/tests/data/empty10ms.dsf diff --git a/libs/taglib/taglib-2.0.2/tests/data/empty1s.aac b/3rdparty/taglib-2.0.2/tests/data/empty1s.aac similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/empty1s.aac rename to 3rdparty/taglib-2.0.2/tests/data/empty1s.aac diff --git a/libs/taglib/taglib-2.0.2/tests/data/empty_alac.m4a b/3rdparty/taglib-2.0.2/tests/data/empty_alac.m4a similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/empty_alac.m4a rename to 3rdparty/taglib-2.0.2/tests/data/empty_alac.m4a diff --git a/libs/taglib/taglib-2.0.2/tests/data/empty_flac.oga b/3rdparty/taglib-2.0.2/tests/data/empty_flac.oga similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/empty_flac.oga rename to 3rdparty/taglib-2.0.2/tests/data/empty_flac.oga diff --git a/libs/taglib/taglib-2.0.2/tests/data/empty_vorbis.oga b/3rdparty/taglib-2.0.2/tests/data/empty_vorbis.oga similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/empty_vorbis.oga rename to 3rdparty/taglib-2.0.2/tests/data/empty_vorbis.oga diff --git a/libs/taglib/taglib-2.0.2/tests/data/excessive_alloc.aif b/3rdparty/taglib-2.0.2/tests/data/excessive_alloc.aif similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/excessive_alloc.aif rename to 3rdparty/taglib-2.0.2/tests/data/excessive_alloc.aif diff --git a/libs/taglib/taglib-2.0.2/tests/data/excessive_alloc.mp3 b/3rdparty/taglib-2.0.2/tests/data/excessive_alloc.mp3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/excessive_alloc.mp3 rename to 3rdparty/taglib-2.0.2/tests/data/excessive_alloc.mp3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/extended-header.mp3 b/3rdparty/taglib-2.0.2/tests/data/extended-header.mp3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/extended-header.mp3 rename to 3rdparty/taglib-2.0.2/tests/data/extended-header.mp3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/float64.wav b/3rdparty/taglib-2.0.2/tests/data/float64.wav similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/float64.wav rename to 3rdparty/taglib-2.0.2/tests/data/float64.wav diff --git a/libs/taglib/taglib-2.0.2/tests/data/four_channels.wv b/3rdparty/taglib-2.0.2/tests/data/four_channels.wv similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/four_channels.wv rename to 3rdparty/taglib-2.0.2/tests/data/four_channels.wv diff --git a/libs/taglib/taglib-2.0.2/tests/data/garbage.mp3 b/3rdparty/taglib-2.0.2/tests/data/garbage.mp3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/garbage.mp3 rename to 3rdparty/taglib-2.0.2/tests/data/garbage.mp3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/gnre.m4a b/3rdparty/taglib-2.0.2/tests/data/gnre.m4a similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/gnre.m4a rename to 3rdparty/taglib-2.0.2/tests/data/gnre.m4a diff --git a/libs/taglib/taglib-2.0.2/tests/data/has-tags.m4a b/3rdparty/taglib-2.0.2/tests/data/has-tags.m4a similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/has-tags.m4a rename to 3rdparty/taglib-2.0.2/tests/data/has-tags.m4a diff --git a/libs/taglib/taglib-2.0.2/tests/data/id3v22-tda.mp3 b/3rdparty/taglib-2.0.2/tests/data/id3v22-tda.mp3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/id3v22-tda.mp3 rename to 3rdparty/taglib-2.0.2/tests/data/id3v22-tda.mp3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/ilst-is-last.m4a b/3rdparty/taglib-2.0.2/tests/data/ilst-is-last.m4a similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/ilst-is-last.m4a rename to 3rdparty/taglib-2.0.2/tests/data/ilst-is-last.m4a diff --git a/libs/taglib/taglib-2.0.2/tests/data/infloop.m4a b/3rdparty/taglib-2.0.2/tests/data/infloop.m4a similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/infloop.m4a rename to 3rdparty/taglib-2.0.2/tests/data/infloop.m4a diff --git a/libs/taglib/taglib-2.0.2/tests/data/infloop.mpc b/3rdparty/taglib-2.0.2/tests/data/infloop.mpc similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/infloop.mpc rename to 3rdparty/taglib-2.0.2/tests/data/infloop.mpc diff --git a/libs/taglib/taglib-2.0.2/tests/data/infloop.wav b/3rdparty/taglib-2.0.2/tests/data/infloop.wav similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/infloop.wav rename to 3rdparty/taglib-2.0.2/tests/data/infloop.wav diff --git a/libs/taglib/taglib-2.0.2/tests/data/infloop.wv b/3rdparty/taglib-2.0.2/tests/data/infloop.wv similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/infloop.wv rename to 3rdparty/taglib-2.0.2/tests/data/infloop.wv diff --git a/libs/taglib/taglib-2.0.2/tests/data/invalid-chunk.wav b/3rdparty/taglib-2.0.2/tests/data/invalid-chunk.wav similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/invalid-chunk.wav rename to 3rdparty/taglib-2.0.2/tests/data/invalid-chunk.wav diff --git a/libs/taglib/taglib-2.0.2/tests/data/invalid-frames1.mp3 b/3rdparty/taglib-2.0.2/tests/data/invalid-frames1.mp3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/invalid-frames1.mp3 rename to 3rdparty/taglib-2.0.2/tests/data/invalid-frames1.mp3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/invalid-frames2.mp3 b/3rdparty/taglib-2.0.2/tests/data/invalid-frames2.mp3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/invalid-frames2.mp3 rename to 3rdparty/taglib-2.0.2/tests/data/invalid-frames2.mp3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/invalid-frames3.mp3 b/3rdparty/taglib-2.0.2/tests/data/invalid-frames3.mp3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/invalid-frames3.mp3 rename to 3rdparty/taglib-2.0.2/tests/data/invalid-frames3.mp3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/itunes10.mp3 b/3rdparty/taglib-2.0.2/tests/data/itunes10.mp3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/itunes10.mp3 rename to 3rdparty/taglib-2.0.2/tests/data/itunes10.mp3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/lame_cbr.mp3 b/3rdparty/taglib-2.0.2/tests/data/lame_cbr.mp3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/lame_cbr.mp3 rename to 3rdparty/taglib-2.0.2/tests/data/lame_cbr.mp3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/lame_vbr.mp3 b/3rdparty/taglib-2.0.2/tests/data/lame_vbr.mp3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/lame_vbr.mp3 rename to 3rdparty/taglib-2.0.2/tests/data/lame_vbr.mp3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/longloop.ape b/3rdparty/taglib-2.0.2/tests/data/longloop.ape similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/longloop.ape rename to 3rdparty/taglib-2.0.2/tests/data/longloop.ape diff --git a/libs/taglib/taglib-2.0.2/tests/data/lossless.wma b/3rdparty/taglib-2.0.2/tests/data/lossless.wma similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/lossless.wma rename to 3rdparty/taglib-2.0.2/tests/data/lossless.wma diff --git a/libs/taglib/taglib-2.0.2/tests/data/lowercase-fields.ogg b/3rdparty/taglib-2.0.2/tests/data/lowercase-fields.ogg similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/lowercase-fields.ogg rename to 3rdparty/taglib-2.0.2/tests/data/lowercase-fields.ogg diff --git a/libs/taglib/taglib-2.0.2/tests/data/mac-390-hdr.ape b/3rdparty/taglib-2.0.2/tests/data/mac-390-hdr.ape similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/mac-390-hdr.ape rename to 3rdparty/taglib-2.0.2/tests/data/mac-390-hdr.ape diff --git a/libs/taglib/taglib-2.0.2/tests/data/mac-396.ape b/3rdparty/taglib-2.0.2/tests/data/mac-396.ape similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/mac-396.ape rename to 3rdparty/taglib-2.0.2/tests/data/mac-396.ape diff --git a/libs/taglib/taglib-2.0.2/tests/data/mac-399-id3v2.ape b/3rdparty/taglib-2.0.2/tests/data/mac-399-id3v2.ape similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/mac-399-id3v2.ape rename to 3rdparty/taglib-2.0.2/tests/data/mac-399-id3v2.ape diff --git a/libs/taglib/taglib-2.0.2/tests/data/mac-399-tagged.ape b/3rdparty/taglib-2.0.2/tests/data/mac-399-tagged.ape similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/mac-399-tagged.ape rename to 3rdparty/taglib-2.0.2/tests/data/mac-399-tagged.ape diff --git a/libs/taglib/taglib-2.0.2/tests/data/mac-399.ape b/3rdparty/taglib-2.0.2/tests/data/mac-399.ape similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/mac-399.ape rename to 3rdparty/taglib-2.0.2/tests/data/mac-399.ape diff --git a/libs/taglib/taglib-2.0.2/tests/data/mpeg2.mp3 b/3rdparty/taglib-2.0.2/tests/data/mpeg2.mp3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/mpeg2.mp3 rename to 3rdparty/taglib-2.0.2/tests/data/mpeg2.mp3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/multiple-vc.flac b/3rdparty/taglib-2.0.2/tests/data/multiple-vc.flac similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/multiple-vc.flac rename to 3rdparty/taglib-2.0.2/tests/data/multiple-vc.flac diff --git a/libs/taglib/taglib-2.0.2/tests/data/no-extension b/3rdparty/taglib-2.0.2/tests/data/no-extension similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/no-extension rename to 3rdparty/taglib-2.0.2/tests/data/no-extension diff --git a/libs/taglib/taglib-2.0.2/tests/data/no-tags.3g2 b/3rdparty/taglib-2.0.2/tests/data/no-tags.3g2 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/no-tags.3g2 rename to 3rdparty/taglib-2.0.2/tests/data/no-tags.3g2 diff --git a/libs/taglib/taglib-2.0.2/tests/data/no-tags.flac b/3rdparty/taglib-2.0.2/tests/data/no-tags.flac similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/no-tags.flac rename to 3rdparty/taglib-2.0.2/tests/data/no-tags.flac diff --git a/libs/taglib/taglib-2.0.2/tests/data/no-tags.m4a b/3rdparty/taglib-2.0.2/tests/data/no-tags.m4a similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/no-tags.m4a rename to 3rdparty/taglib-2.0.2/tests/data/no-tags.m4a diff --git a/libs/taglib/taglib-2.0.2/tests/data/no_length.wv b/3rdparty/taglib-2.0.2/tests/data/no_length.wv similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/no_length.wv rename to 3rdparty/taglib-2.0.2/tests/data/no_length.wv diff --git a/libs/taglib/taglib-2.0.2/tests/data/noise.aif b/3rdparty/taglib-2.0.2/tests/data/noise.aif similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/noise.aif rename to 3rdparty/taglib-2.0.2/tests/data/noise.aif diff --git a/libs/taglib/taglib-2.0.2/tests/data/noise_odd.aif b/3rdparty/taglib-2.0.2/tests/data/noise_odd.aif similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/noise_odd.aif rename to 3rdparty/taglib-2.0.2/tests/data/noise_odd.aif diff --git a/libs/taglib/taglib-2.0.2/tests/data/non-full-meta.m4a b/3rdparty/taglib-2.0.2/tests/data/non-full-meta.m4a similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/non-full-meta.m4a rename to 3rdparty/taglib-2.0.2/tests/data/non-full-meta.m4a diff --git a/libs/taglib/taglib-2.0.2/tests/data/non_standard_rate.wv b/3rdparty/taglib-2.0.2/tests/data/non_standard_rate.wv similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/non_standard_rate.wv rename to 3rdparty/taglib-2.0.2/tests/data/non_standard_rate.wv diff --git a/libs/taglib/taglib-2.0.2/tests/data/nonprintable-atom-type.m4a b/3rdparty/taglib-2.0.2/tests/data/nonprintable-atom-type.m4a similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/nonprintable-atom-type.m4a rename to 3rdparty/taglib-2.0.2/tests/data/nonprintable-atom-type.m4a diff --git a/libs/taglib/taglib-2.0.2/tests/data/pcm_with_fact_chunk.wav b/3rdparty/taglib-2.0.2/tests/data/pcm_with_fact_chunk.wav similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/pcm_with_fact_chunk.wav rename to 3rdparty/taglib-2.0.2/tests/data/pcm_with_fact_chunk.wav diff --git a/libs/taglib/taglib-2.0.2/tests/data/rare_frames.mp3 b/3rdparty/taglib-2.0.2/tests/data/rare_frames.mp3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/rare_frames.mp3 rename to 3rdparty/taglib-2.0.2/tests/data/rare_frames.mp3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/segfault.aif b/3rdparty/taglib-2.0.2/tests/data/segfault.aif similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/segfault.aif rename to 3rdparty/taglib-2.0.2/tests/data/segfault.aif diff --git a/libs/taglib/taglib-2.0.2/tests/data/segfault.mpc b/3rdparty/taglib-2.0.2/tests/data/segfault.mpc similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/segfault.mpc rename to 3rdparty/taglib-2.0.2/tests/data/segfault.mpc diff --git a/libs/taglib/taglib-2.0.2/tests/data/segfault.oga b/3rdparty/taglib-2.0.2/tests/data/segfault.oga similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/segfault.oga rename to 3rdparty/taglib-2.0.2/tests/data/segfault.oga diff --git a/libs/taglib/taglib-2.0.2/tests/data/segfault.wav b/3rdparty/taglib-2.0.2/tests/data/segfault.wav similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/segfault.wav rename to 3rdparty/taglib-2.0.2/tests/data/segfault.wav diff --git a/libs/taglib/taglib-2.0.2/tests/data/segfault2.mpc b/3rdparty/taglib-2.0.2/tests/data/segfault2.mpc similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/segfault2.mpc rename to 3rdparty/taglib-2.0.2/tests/data/segfault2.mpc diff --git a/libs/taglib/taglib-2.0.2/tests/data/silence-1.wma b/3rdparty/taglib-2.0.2/tests/data/silence-1.wma similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/silence-1.wma rename to 3rdparty/taglib-2.0.2/tests/data/silence-1.wma diff --git a/libs/taglib/taglib-2.0.2/tests/data/silence-44-s.flac b/3rdparty/taglib-2.0.2/tests/data/silence-44-s.flac similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/silence-44-s.flac rename to 3rdparty/taglib-2.0.2/tests/data/silence-44-s.flac diff --git a/libs/taglib/taglib-2.0.2/tests/data/sinewave.flac b/3rdparty/taglib-2.0.2/tests/data/sinewave.flac similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/sinewave.flac rename to 3rdparty/taglib-2.0.2/tests/data/sinewave.flac diff --git a/libs/taglib/taglib-2.0.2/tests/data/stripped.xm b/3rdparty/taglib-2.0.2/tests/data/stripped.xm similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/stripped.xm rename to 3rdparty/taglib-2.0.2/tests/data/stripped.xm diff --git a/libs/taglib/taglib-2.0.2/tests/data/sv4_header.mpc b/3rdparty/taglib-2.0.2/tests/data/sv4_header.mpc similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/sv4_header.mpc rename to 3rdparty/taglib-2.0.2/tests/data/sv4_header.mpc diff --git a/libs/taglib/taglib-2.0.2/tests/data/sv5_header.mpc b/3rdparty/taglib-2.0.2/tests/data/sv5_header.mpc similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/sv5_header.mpc rename to 3rdparty/taglib-2.0.2/tests/data/sv5_header.mpc diff --git a/libs/taglib/taglib-2.0.2/tests/data/sv8_header.mpc b/3rdparty/taglib-2.0.2/tests/data/sv8_header.mpc similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/sv8_header.mpc rename to 3rdparty/taglib-2.0.2/tests/data/sv8_header.mpc diff --git a/libs/taglib/taglib-2.0.2/tests/data/tagged.tta b/3rdparty/taglib-2.0.2/tests/data/tagged.tta similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/tagged.tta rename to 3rdparty/taglib-2.0.2/tests/data/tagged.tta diff --git a/libs/taglib/taglib-2.0.2/tests/data/tagged.wv b/3rdparty/taglib-2.0.2/tests/data/tagged.wv similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/tagged.wv rename to 3rdparty/taglib-2.0.2/tests/data/tagged.wv diff --git a/libs/taglib/taglib-2.0.2/tests/data/test.it b/3rdparty/taglib-2.0.2/tests/data/test.it similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/test.it rename to 3rdparty/taglib-2.0.2/tests/data/test.it diff --git a/libs/taglib/taglib-2.0.2/tests/data/test.mod b/3rdparty/taglib-2.0.2/tests/data/test.mod similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/test.mod rename to 3rdparty/taglib-2.0.2/tests/data/test.mod diff --git a/libs/taglib/taglib-2.0.2/tests/data/test.ogg b/3rdparty/taglib-2.0.2/tests/data/test.ogg similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/test.ogg rename to 3rdparty/taglib-2.0.2/tests/data/test.ogg diff --git a/libs/taglib/taglib-2.0.2/tests/data/test.s3m b/3rdparty/taglib-2.0.2/tests/data/test.s3m similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/test.s3m rename to 3rdparty/taglib-2.0.2/tests/data/test.s3m diff --git a/libs/taglib/taglib-2.0.2/tests/data/test.xm b/3rdparty/taglib-2.0.2/tests/data/test.xm similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/test.xm rename to 3rdparty/taglib-2.0.2/tests/data/test.xm diff --git a/libs/taglib/taglib-2.0.2/tests/data/toc_many_children.mp3 b/3rdparty/taglib-2.0.2/tests/data/toc_many_children.mp3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/toc_many_children.mp3 rename to 3rdparty/taglib-2.0.2/tests/data/toc_many_children.mp3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/uint8we.wav b/3rdparty/taglib-2.0.2/tests/data/uint8we.wav similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/uint8we.wav rename to 3rdparty/taglib-2.0.2/tests/data/uint8we.wav diff --git a/libs/taglib/taglib-2.0.2/tests/data/unsupported-extension.xx b/3rdparty/taglib-2.0.2/tests/data/unsupported-extension.xx similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/unsupported-extension.xx rename to 3rdparty/taglib-2.0.2/tests/data/unsupported-extension.xx diff --git a/libs/taglib/taglib-2.0.2/tests/data/unsynch.id3 b/3rdparty/taglib-2.0.2/tests/data/unsynch.id3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/unsynch.id3 rename to 3rdparty/taglib-2.0.2/tests/data/unsynch.id3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/w000.mp3 b/3rdparty/taglib-2.0.2/tests/data/w000.mp3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/w000.mp3 rename to 3rdparty/taglib-2.0.2/tests/data/w000.mp3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/xing.mp3 b/3rdparty/taglib-2.0.2/tests/data/xing.mp3 similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/xing.mp3 rename to 3rdparty/taglib-2.0.2/tests/data/xing.mp3 diff --git a/libs/taglib/taglib-2.0.2/tests/data/zero-length-mdat.m4a b/3rdparty/taglib-2.0.2/tests/data/zero-length-mdat.m4a similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/zero-length-mdat.m4a rename to 3rdparty/taglib-2.0.2/tests/data/zero-length-mdat.m4a diff --git a/libs/taglib/taglib-2.0.2/tests/data/zero-size-chunk.wav b/3rdparty/taglib-2.0.2/tests/data/zero-size-chunk.wav similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/zero-size-chunk.wav rename to 3rdparty/taglib-2.0.2/tests/data/zero-size-chunk.wav diff --git a/libs/taglib/taglib-2.0.2/tests/data/zero-sized-padding.flac b/3rdparty/taglib-2.0.2/tests/data/zero-sized-padding.flac similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/zero-sized-padding.flac rename to 3rdparty/taglib-2.0.2/tests/data/zero-sized-padding.flac diff --git a/libs/taglib/taglib-2.0.2/tests/data/zerodiv.ape b/3rdparty/taglib-2.0.2/tests/data/zerodiv.ape similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/zerodiv.ape rename to 3rdparty/taglib-2.0.2/tests/data/zerodiv.ape diff --git a/libs/taglib/taglib-2.0.2/tests/data/zerodiv.mpc b/3rdparty/taglib-2.0.2/tests/data/zerodiv.mpc similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/data/zerodiv.mpc rename to 3rdparty/taglib-2.0.2/tests/data/zerodiv.mpc diff --git a/libs/taglib/taglib-2.0.2/tests/main.cpp b/3rdparty/taglib-2.0.2/tests/main.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/main.cpp rename to 3rdparty/taglib-2.0.2/tests/main.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/plainfile.h b/3rdparty/taglib-2.0.2/tests/plainfile.h similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/plainfile.h rename to 3rdparty/taglib-2.0.2/tests/plainfile.h diff --git a/libs/taglib/taglib-2.0.2/tests/test_aiff.cpp b/3rdparty/taglib-2.0.2/tests/test_aiff.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_aiff.cpp rename to 3rdparty/taglib-2.0.2/tests/test_aiff.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_ape.cpp b/3rdparty/taglib-2.0.2/tests/test_ape.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_ape.cpp rename to 3rdparty/taglib-2.0.2/tests/test_ape.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_apetag.cpp b/3rdparty/taglib-2.0.2/tests/test_apetag.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_apetag.cpp rename to 3rdparty/taglib-2.0.2/tests/test_apetag.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_asf.cpp b/3rdparty/taglib-2.0.2/tests/test_asf.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_asf.cpp rename to 3rdparty/taglib-2.0.2/tests/test_asf.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_bytevector.cpp b/3rdparty/taglib-2.0.2/tests/test_bytevector.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_bytevector.cpp rename to 3rdparty/taglib-2.0.2/tests/test_bytevector.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_bytevectorlist.cpp b/3rdparty/taglib-2.0.2/tests/test_bytevectorlist.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_bytevectorlist.cpp rename to 3rdparty/taglib-2.0.2/tests/test_bytevectorlist.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_bytevectorstream.cpp b/3rdparty/taglib-2.0.2/tests/test_bytevectorstream.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_bytevectorstream.cpp rename to 3rdparty/taglib-2.0.2/tests/test_bytevectorstream.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_complexproperties.cpp b/3rdparty/taglib-2.0.2/tests/test_complexproperties.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_complexproperties.cpp rename to 3rdparty/taglib-2.0.2/tests/test_complexproperties.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_dsdiff.cpp b/3rdparty/taglib-2.0.2/tests/test_dsdiff.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_dsdiff.cpp rename to 3rdparty/taglib-2.0.2/tests/test_dsdiff.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_dsf.cpp b/3rdparty/taglib-2.0.2/tests/test_dsf.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_dsf.cpp rename to 3rdparty/taglib-2.0.2/tests/test_dsf.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_file.cpp b/3rdparty/taglib-2.0.2/tests/test_file.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_file.cpp rename to 3rdparty/taglib-2.0.2/tests/test_file.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_fileref.cpp b/3rdparty/taglib-2.0.2/tests/test_fileref.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_fileref.cpp rename to 3rdparty/taglib-2.0.2/tests/test_fileref.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_flac.cpp b/3rdparty/taglib-2.0.2/tests/test_flac.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_flac.cpp rename to 3rdparty/taglib-2.0.2/tests/test_flac.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_flacpicture.cpp b/3rdparty/taglib-2.0.2/tests/test_flacpicture.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_flacpicture.cpp rename to 3rdparty/taglib-2.0.2/tests/test_flacpicture.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_flacunknownmetadatablock.cpp b/3rdparty/taglib-2.0.2/tests/test_flacunknownmetadatablock.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_flacunknownmetadatablock.cpp rename to 3rdparty/taglib-2.0.2/tests/test_flacunknownmetadatablock.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_id3v1.cpp b/3rdparty/taglib-2.0.2/tests/test_id3v1.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_id3v1.cpp rename to 3rdparty/taglib-2.0.2/tests/test_id3v1.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_id3v2.cpp b/3rdparty/taglib-2.0.2/tests/test_id3v2.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_id3v2.cpp rename to 3rdparty/taglib-2.0.2/tests/test_id3v2.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_id3v2framefactory.cpp b/3rdparty/taglib-2.0.2/tests/test_id3v2framefactory.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_id3v2framefactory.cpp rename to 3rdparty/taglib-2.0.2/tests/test_id3v2framefactory.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_info.cpp b/3rdparty/taglib-2.0.2/tests/test_info.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_info.cpp rename to 3rdparty/taglib-2.0.2/tests/test_info.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_it.cpp b/3rdparty/taglib-2.0.2/tests/test_it.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_it.cpp rename to 3rdparty/taglib-2.0.2/tests/test_it.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_list.cpp b/3rdparty/taglib-2.0.2/tests/test_list.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_list.cpp rename to 3rdparty/taglib-2.0.2/tests/test_list.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_map.cpp b/3rdparty/taglib-2.0.2/tests/test_map.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_map.cpp rename to 3rdparty/taglib-2.0.2/tests/test_map.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_mod.cpp b/3rdparty/taglib-2.0.2/tests/test_mod.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_mod.cpp rename to 3rdparty/taglib-2.0.2/tests/test_mod.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_mp4.cpp b/3rdparty/taglib-2.0.2/tests/test_mp4.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_mp4.cpp rename to 3rdparty/taglib-2.0.2/tests/test_mp4.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_mp4coverart.cpp b/3rdparty/taglib-2.0.2/tests/test_mp4coverart.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_mp4coverart.cpp rename to 3rdparty/taglib-2.0.2/tests/test_mp4coverart.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_mp4item.cpp b/3rdparty/taglib-2.0.2/tests/test_mp4item.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_mp4item.cpp rename to 3rdparty/taglib-2.0.2/tests/test_mp4item.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_mpc.cpp b/3rdparty/taglib-2.0.2/tests/test_mpc.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_mpc.cpp rename to 3rdparty/taglib-2.0.2/tests/test_mpc.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_mpeg.cpp b/3rdparty/taglib-2.0.2/tests/test_mpeg.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_mpeg.cpp rename to 3rdparty/taglib-2.0.2/tests/test_mpeg.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_ogg.cpp b/3rdparty/taglib-2.0.2/tests/test_ogg.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_ogg.cpp rename to 3rdparty/taglib-2.0.2/tests/test_ogg.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_oggflac.cpp b/3rdparty/taglib-2.0.2/tests/test_oggflac.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_oggflac.cpp rename to 3rdparty/taglib-2.0.2/tests/test_oggflac.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_opus.cpp b/3rdparty/taglib-2.0.2/tests/test_opus.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_opus.cpp rename to 3rdparty/taglib-2.0.2/tests/test_opus.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_propertymap.cpp b/3rdparty/taglib-2.0.2/tests/test_propertymap.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_propertymap.cpp rename to 3rdparty/taglib-2.0.2/tests/test_propertymap.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_riff.cpp b/3rdparty/taglib-2.0.2/tests/test_riff.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_riff.cpp rename to 3rdparty/taglib-2.0.2/tests/test_riff.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_s3m.cpp b/3rdparty/taglib-2.0.2/tests/test_s3m.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_s3m.cpp rename to 3rdparty/taglib-2.0.2/tests/test_s3m.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_sizes.cpp b/3rdparty/taglib-2.0.2/tests/test_sizes.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_sizes.cpp rename to 3rdparty/taglib-2.0.2/tests/test_sizes.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_speex.cpp b/3rdparty/taglib-2.0.2/tests/test_speex.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_speex.cpp rename to 3rdparty/taglib-2.0.2/tests/test_speex.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_string.cpp b/3rdparty/taglib-2.0.2/tests/test_string.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_string.cpp rename to 3rdparty/taglib-2.0.2/tests/test_string.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_synchdata.cpp b/3rdparty/taglib-2.0.2/tests/test_synchdata.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_synchdata.cpp rename to 3rdparty/taglib-2.0.2/tests/test_synchdata.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_tag_c.cpp b/3rdparty/taglib-2.0.2/tests/test_tag_c.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_tag_c.cpp rename to 3rdparty/taglib-2.0.2/tests/test_tag_c.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_trueaudio.cpp b/3rdparty/taglib-2.0.2/tests/test_trueaudio.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_trueaudio.cpp rename to 3rdparty/taglib-2.0.2/tests/test_trueaudio.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_variant.cpp b/3rdparty/taglib-2.0.2/tests/test_variant.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_variant.cpp rename to 3rdparty/taglib-2.0.2/tests/test_variant.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_versionnumber.cpp b/3rdparty/taglib-2.0.2/tests/test_versionnumber.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_versionnumber.cpp rename to 3rdparty/taglib-2.0.2/tests/test_versionnumber.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_wav.cpp b/3rdparty/taglib-2.0.2/tests/test_wav.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_wav.cpp rename to 3rdparty/taglib-2.0.2/tests/test_wav.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_wavpack.cpp b/3rdparty/taglib-2.0.2/tests/test_wavpack.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_wavpack.cpp rename to 3rdparty/taglib-2.0.2/tests/test_wavpack.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_xiphcomment.cpp b/3rdparty/taglib-2.0.2/tests/test_xiphcomment.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_xiphcomment.cpp rename to 3rdparty/taglib-2.0.2/tests/test_xiphcomment.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/test_xm.cpp b/3rdparty/taglib-2.0.2/tests/test_xm.cpp similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/test_xm.cpp rename to 3rdparty/taglib-2.0.2/tests/test_xm.cpp diff --git a/libs/taglib/taglib-2.0.2/tests/utils.h b/3rdparty/taglib-2.0.2/tests/utils.h similarity index 100% rename from libs/taglib/taglib-2.0.2/tests/utils.h rename to 3rdparty/taglib-2.0.2/tests/utils.h diff --git a/libs/taglib/utfcpp-master/.github/workflows/cmake-multi-platform.yml b/3rdparty/utfcpp-4.0.6/.github/workflows/cmake-multi-platform.yml similarity index 100% rename from libs/taglib/utfcpp-master/.github/workflows/cmake-multi-platform.yml rename to 3rdparty/utfcpp-4.0.6/.github/workflows/cmake-multi-platform.yml diff --git a/libs/taglib/utfcpp-master/.gitignore b/3rdparty/utfcpp-4.0.6/.gitignore similarity index 100% rename from libs/taglib/utfcpp-master/.gitignore rename to 3rdparty/utfcpp-4.0.6/.gitignore diff --git a/libs/taglib/utfcpp-master/.gitmodules b/3rdparty/utfcpp-4.0.6/.gitmodules similarity index 100% rename from libs/taglib/utfcpp-master/.gitmodules rename to 3rdparty/utfcpp-4.0.6/.gitmodules diff --git a/libs/taglib/utfcpp-master/CMakeLists.txt b/3rdparty/utfcpp-4.0.6/CMakeLists.txt similarity index 98% rename from libs/taglib/utfcpp-master/CMakeLists.txt rename to 3rdparty/utfcpp-4.0.6/CMakeLists.txt index f24f9b65..91259252 100644 --- a/libs/taglib/utfcpp-master/CMakeLists.txt +++ b/3rdparty/utfcpp-4.0.6/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required (VERSION 3.14...3.27) project (utf8cpp - VERSION 4.0.4 + VERSION 4.0.6 LANGUAGES CXX DESCRIPTION "C++ portable library for working with utf-8 encoding") diff --git a/libs/taglib/utfcpp-master/LICENSE b/3rdparty/utfcpp-4.0.6/LICENSE similarity index 100% rename from libs/taglib/utfcpp-master/LICENSE rename to 3rdparty/utfcpp-4.0.6/LICENSE diff --git a/libs/taglib/utfcpp-master/README.md b/3rdparty/utfcpp-4.0.6/README.md similarity index 100% rename from libs/taglib/utfcpp-master/README.md rename to 3rdparty/utfcpp-4.0.6/README.md diff --git a/libs/taglib/utfcpp-master/source/utf8.h b/3rdparty/utfcpp-4.0.6/source/utf8.h similarity index 100% rename from libs/taglib/utfcpp-master/source/utf8.h rename to 3rdparty/utfcpp-4.0.6/source/utf8.h diff --git a/libs/taglib/utfcpp-master/source/utf8/checked.h b/3rdparty/utfcpp-4.0.6/source/utf8/checked.h similarity index 100% rename from libs/taglib/utfcpp-master/source/utf8/checked.h rename to 3rdparty/utfcpp-4.0.6/source/utf8/checked.h diff --git a/libs/taglib/utfcpp-master/source/utf8/core.h b/3rdparty/utfcpp-4.0.6/source/utf8/core.h similarity index 97% rename from libs/taglib/utfcpp-master/source/utf8/core.h rename to 3rdparty/utfcpp-4.0.6/source/utf8/core.h index 4494c538..627133c6 100644 --- a/libs/taglib/utfcpp-master/source/utf8/core.h +++ b/3rdparty/utfcpp-4.0.6/source/utf8/core.h @@ -215,7 +215,7 @@ namespace internal UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end) - code_point += (*it) & 0x3f; + code_point = static_cast(code_point + ((*it) & 0x3f)); return UTF8_OK; } @@ -234,11 +234,11 @@ namespace internal UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end) - code_point += (utf8::internal::mask8(*it) << 6) & 0xfff; + code_point = static_cast(code_point + ((utf8::internal::mask8(*it) << 6) & 0xfff)); UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end) - code_point += (*it) & 0x3f; + code_point = static_cast(code_point + ((*it) & 0x3f)); return UTF8_OK; } @@ -327,7 +327,7 @@ namespace internal else if (is_lead_surrogate(first_word)) { const utfchar16_t second_word = *it++; if (is_trail_surrogate(second_word)) { - code_point = (first_word << 10) + second_word + SURROGATE_OFFSET; + code_point = static_cast(first_word << 10) + second_word + SURROGATE_OFFSET; return UTF8_OK; } else err = INCOMPLETE_SEQUENCE; diff --git a/libs/taglib/utfcpp-master/source/utf8/cpp11.h b/3rdparty/utfcpp-4.0.6/source/utf8/cpp11.h similarity index 100% rename from libs/taglib/utfcpp-master/source/utf8/cpp11.h rename to 3rdparty/utfcpp-4.0.6/source/utf8/cpp11.h diff --git a/libs/taglib/utfcpp-master/source/utf8/cpp17.h b/3rdparty/utfcpp-4.0.6/source/utf8/cpp17.h similarity index 100% rename from libs/taglib/utfcpp-master/source/utf8/cpp17.h rename to 3rdparty/utfcpp-4.0.6/source/utf8/cpp17.h diff --git a/libs/taglib/utfcpp-master/source/utf8/cpp20.h b/3rdparty/utfcpp-4.0.6/source/utf8/cpp20.h similarity index 100% rename from libs/taglib/utfcpp-master/source/utf8/cpp20.h rename to 3rdparty/utfcpp-4.0.6/source/utf8/cpp20.h diff --git a/libs/taglib/utfcpp-master/source/utf8/unchecked.h b/3rdparty/utfcpp-4.0.6/source/utf8/unchecked.h similarity index 97% rename from libs/taglib/utfcpp-master/source/utf8/unchecked.h rename to 3rdparty/utfcpp-4.0.6/source/utf8/unchecked.h index 65d4948f..bf291789 100644 --- a/libs/taglib/utfcpp-master/source/utf8/unchecked.h +++ b/3rdparty/utfcpp-4.0.6/source/utf8/unchecked.h @@ -115,15 +115,15 @@ namespace utf8 ++it; cp = ((cp << 12) & 0xffff) + ((utf8::internal::mask8(*it) << 6) & 0xfff); ++it; - cp += (*it) & 0x3f; + cp = static_cast(cp + ((*it) & 0x3f)); break; case 4: ++it; cp = ((cp << 18) & 0x1fffff) + ((utf8::internal::mask8(*it) << 12) & 0x3ffff); ++it; - cp += (utf8::internal::mask8(*it) << 6) & 0xfff; + cp = static_cast(cp + ((utf8::internal::mask8(*it) << 6) & 0xfff)); ++it; - cp += (*it) & 0x3f; + cp = static_cast(cp + ((*it) & 0x3f)); break; } ++it; diff --git a/libs/taglib/utfcpp-master/tests/CMakeLists.txt b/3rdparty/utfcpp-4.0.6/tests/CMakeLists.txt similarity index 89% rename from libs/taglib/utfcpp-master/tests/CMakeLists.txt rename to 3rdparty/utfcpp-4.0.6/tests/CMakeLists.txt index 8a00a6a0..f2bf1fce 100644 --- a/libs/taglib/utfcpp-master/tests/CMakeLists.txt +++ b/3rdparty/utfcpp-4.0.6/tests/CMakeLists.txt @@ -6,6 +6,14 @@ add_library(${PROJECT_NAME} INTERFACE) include_directories("${PROJECT_SOURCE_DIR}/../source") +if (MSVC) + # warning level 4 + add_compile_options(/W4) +else() + # additional warnings + add_compile_options(-Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion) +endif() + add_executable(negative negative.cpp) add_executable(cpp11 test_cpp11.cpp) add_executable(cpp17 test_cpp17.cpp) @@ -14,12 +22,6 @@ add_executable(apitests apitests.cpp) add_executable(noexceptionstests noexceptionstests.cpp) - - -target_compile_options(${PROJECT_NAME} INTERFACE - $<$:/W4> - $<$>:-Wall -Wextra -Wpedantic -Wconversion>) - target_compile_options(noexceptionstests PUBLIC -fno-exceptions) set_target_properties(negative apitests noexceptionstests diff --git a/libs/taglib/utfcpp-master/tests/apitests.cpp b/3rdparty/utfcpp-4.0.6/tests/apitests.cpp similarity index 100% rename from libs/taglib/utfcpp-master/tests/apitests.cpp rename to 3rdparty/utfcpp-4.0.6/tests/apitests.cpp diff --git a/libs/taglib/utfcpp-master/tests/docker/Dockerfile b/3rdparty/utfcpp-4.0.6/tests/docker/Dockerfile similarity index 100% rename from libs/taglib/utfcpp-master/tests/docker/Dockerfile rename to 3rdparty/utfcpp-4.0.6/tests/docker/Dockerfile diff --git a/libs/taglib/utfcpp-master/tests/negative.cpp b/3rdparty/utfcpp-4.0.6/tests/negative.cpp similarity index 100% rename from libs/taglib/utfcpp-master/tests/negative.cpp rename to 3rdparty/utfcpp-4.0.6/tests/negative.cpp diff --git a/libs/taglib/utfcpp-master/tests/noexceptionstests.cpp b/3rdparty/utfcpp-4.0.6/tests/noexceptionstests.cpp similarity index 100% rename from libs/taglib/utfcpp-master/tests/noexceptionstests.cpp rename to 3rdparty/utfcpp-4.0.6/tests/noexceptionstests.cpp diff --git a/libs/taglib/utfcpp-master/tests/test_checked_api.h b/3rdparty/utfcpp-4.0.6/tests/test_checked_api.h similarity index 100% rename from libs/taglib/utfcpp-master/tests/test_checked_api.h rename to 3rdparty/utfcpp-4.0.6/tests/test_checked_api.h diff --git a/libs/taglib/utfcpp-master/tests/test_checked_iterator.h b/3rdparty/utfcpp-4.0.6/tests/test_checked_iterator.h similarity index 100% rename from libs/taglib/utfcpp-master/tests/test_checked_iterator.h rename to 3rdparty/utfcpp-4.0.6/tests/test_checked_iterator.h diff --git a/libs/taglib/utfcpp-master/tests/test_cpp11.cpp b/3rdparty/utfcpp-4.0.6/tests/test_cpp11.cpp similarity index 100% rename from libs/taglib/utfcpp-master/tests/test_cpp11.cpp rename to 3rdparty/utfcpp-4.0.6/tests/test_cpp11.cpp diff --git a/libs/taglib/utfcpp-master/tests/test_cpp17.cpp b/3rdparty/utfcpp-4.0.6/tests/test_cpp17.cpp similarity index 100% rename from libs/taglib/utfcpp-master/tests/test_cpp17.cpp rename to 3rdparty/utfcpp-4.0.6/tests/test_cpp17.cpp diff --git a/libs/taglib/utfcpp-master/tests/test_cpp20.cpp b/3rdparty/utfcpp-4.0.6/tests/test_cpp20.cpp similarity index 100% rename from libs/taglib/utfcpp-master/tests/test_cpp20.cpp rename to 3rdparty/utfcpp-4.0.6/tests/test_cpp20.cpp diff --git a/libs/taglib/utfcpp-master/tests/test_data/utf8_invalid.txt b/3rdparty/utfcpp-4.0.6/tests/test_data/utf8_invalid.txt similarity index 100% rename from libs/taglib/utfcpp-master/tests/test_data/utf8_invalid.txt rename to 3rdparty/utfcpp-4.0.6/tests/test_data/utf8_invalid.txt diff --git a/libs/taglib/utfcpp-master/tests/test_unchecked_api.h b/3rdparty/utfcpp-4.0.6/tests/test_unchecked_api.h similarity index 100% rename from libs/taglib/utfcpp-master/tests/test_unchecked_api.h rename to 3rdparty/utfcpp-4.0.6/tests/test_unchecked_api.h diff --git a/libs/taglib/utfcpp-master/tests/test_unchecked_iterator.h b/3rdparty/utfcpp-4.0.6/tests/test_unchecked_iterator.h similarity index 100% rename from libs/taglib/utfcpp-master/tests/test_unchecked_iterator.h rename to 3rdparty/utfcpp-4.0.6/tests/test_unchecked_iterator.h diff --git a/libs/taglib/utfcpp-master/utf8cppConfig.cmake.in b/3rdparty/utfcpp-4.0.6/utf8cppConfig.cmake.in similarity index 100% rename from libs/taglib/utfcpp-master/utf8cppConfig.cmake.in rename to 3rdparty/utfcpp-4.0.6/utf8cppConfig.cmake.in diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/.clang-format b/3rdparty/yaml-cpp-0.8.0/.clang-format similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/.clang-format rename to 3rdparty/yaml-cpp-0.8.0/.clang-format diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/.codedocs b/3rdparty/yaml-cpp-0.8.0/.codedocs similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/.codedocs rename to 3rdparty/yaml-cpp-0.8.0/.codedocs diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/.github/workflows/build.yml b/3rdparty/yaml-cpp-0.8.0/.github/workflows/build.yml similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/.github/workflows/build.yml rename to 3rdparty/yaml-cpp-0.8.0/.github/workflows/build.yml diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/.gitignore b/3rdparty/yaml-cpp-0.8.0/.gitignore similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/.gitignore rename to 3rdparty/yaml-cpp-0.8.0/.gitignore diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/BUILD.bazel b/3rdparty/yaml-cpp-0.8.0/BUILD.bazel similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/BUILD.bazel rename to 3rdparty/yaml-cpp-0.8.0/BUILD.bazel diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/CMakeLists.txt b/3rdparty/yaml-cpp-0.8.0/CMakeLists.txt similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/CMakeLists.txt rename to 3rdparty/yaml-cpp-0.8.0/CMakeLists.txt diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/CONTRIBUTING.md b/3rdparty/yaml-cpp-0.8.0/CONTRIBUTING.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/CONTRIBUTING.md rename to 3rdparty/yaml-cpp-0.8.0/CONTRIBUTING.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/LICENSE b/3rdparty/yaml-cpp-0.8.0/LICENSE similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/LICENSE rename to 3rdparty/yaml-cpp-0.8.0/LICENSE diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/README.md b/3rdparty/yaml-cpp-0.8.0/README.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/README.md rename to 3rdparty/yaml-cpp-0.8.0/README.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/SECURITY.md b/3rdparty/yaml-cpp-0.8.0/SECURITY.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/SECURITY.md rename to 3rdparty/yaml-cpp-0.8.0/SECURITY.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/WORKSPACE b/3rdparty/yaml-cpp-0.8.0/WORKSPACE similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/WORKSPACE rename to 3rdparty/yaml-cpp-0.8.0/WORKSPACE diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/cmake_uninstall.cmake.in b/3rdparty/yaml-cpp-0.8.0/cmake_uninstall.cmake.in similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/cmake_uninstall.cmake.in rename to 3rdparty/yaml-cpp-0.8.0/cmake_uninstall.cmake.in diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/docs/Breaking-Changes.md b/3rdparty/yaml-cpp-0.8.0/docs/Breaking-Changes.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/docs/Breaking-Changes.md rename to 3rdparty/yaml-cpp-0.8.0/docs/Breaking-Changes.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/docs/How-To-Emit-YAML.md b/3rdparty/yaml-cpp-0.8.0/docs/How-To-Emit-YAML.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/docs/How-To-Emit-YAML.md rename to 3rdparty/yaml-cpp-0.8.0/docs/How-To-Emit-YAML.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/docs/How-To-Parse-A-Document-(Old-API).md b/3rdparty/yaml-cpp-0.8.0/docs/How-To-Parse-A-Document-(Old-API).md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/docs/How-To-Parse-A-Document-(Old-API).md rename to 3rdparty/yaml-cpp-0.8.0/docs/How-To-Parse-A-Document-(Old-API).md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/docs/Strings.md b/3rdparty/yaml-cpp-0.8.0/docs/Strings.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/docs/Strings.md rename to 3rdparty/yaml-cpp-0.8.0/docs/Strings.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/docs/Tutorial.md b/3rdparty/yaml-cpp-0.8.0/docs/Tutorial.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/docs/Tutorial.md rename to 3rdparty/yaml-cpp-0.8.0/docs/Tutorial.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/docs/_config.yml b/3rdparty/yaml-cpp-0.8.0/docs/_config.yml similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/docs/_config.yml rename to 3rdparty/yaml-cpp-0.8.0/docs/_config.yml diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/docs/index.md b/3rdparty/yaml-cpp-0.8.0/docs/index.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/docs/index.md rename to 3rdparty/yaml-cpp-0.8.0/docs/index.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/anchor.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/anchor.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/anchor.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/anchor.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/binary.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/binary.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/binary.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/binary.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/contrib/anchordict.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/contrib/anchordict.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/contrib/anchordict.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/contrib/anchordict.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/contrib/graphbuilder.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/contrib/graphbuilder.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/contrib/graphbuilder.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/contrib/graphbuilder.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/depthguard.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/depthguard.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/depthguard.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/depthguard.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/dll.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/dll.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/dll.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/dll.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/emitfromevents.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/emitfromevents.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/emitfromevents.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/emitfromevents.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/emitter.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/emitter.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/emitter.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/emitter.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/emitterdef.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/emitterdef.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/emitterdef.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/emitterdef.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/emittermanip.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/emittermanip.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/emittermanip.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/emittermanip.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/emitterstyle.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/emitterstyle.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/emitterstyle.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/emitterstyle.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/eventhandler.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/eventhandler.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/eventhandler.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/eventhandler.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/exceptions.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/exceptions.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/exceptions.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/exceptions.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/mark.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/mark.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/mark.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/mark.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/convert.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/convert.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/convert.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/convert.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/impl.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/impl.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/impl.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/impl.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/iterator.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/iterator.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/iterator.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/iterator.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/iterator_fwd.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/iterator_fwd.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/iterator_fwd.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/iterator_fwd.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/memory.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/memory.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/memory.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/memory.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/node.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/node.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/node.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/node.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/node_data.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/node_data.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/node_data.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/node_data.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/node_iterator.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/node_iterator.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/node_iterator.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/node_iterator.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/node_ref.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/node_ref.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/node_ref.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/detail/node_ref.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/emit.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/emit.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/emit.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/emit.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/impl.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/impl.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/impl.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/impl.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/iterator.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/iterator.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/iterator.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/iterator.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/node.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/node.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/node.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/node.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/parse.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/parse.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/parse.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/parse.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/ptr.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/ptr.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/ptr.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/ptr.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/type.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/type.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/node/type.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/node/type.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/noexcept.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/noexcept.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/noexcept.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/noexcept.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/null.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/null.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/null.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/null.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/ostream_wrapper.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/ostream_wrapper.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/ostream_wrapper.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/ostream_wrapper.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/parser.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/parser.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/parser.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/parser.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/stlemitter.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/stlemitter.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/stlemitter.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/stlemitter.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/traits.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/traits.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/traits.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/traits.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/yaml.h b/3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/yaml.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/include/yaml-cpp/yaml.h rename to 3rdparty/yaml-cpp-0.8.0/include/yaml-cpp/yaml.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/install.txt b/3rdparty/yaml-cpp-0.8.0/install.txt similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/install.txt rename to 3rdparty/yaml-cpp-0.8.0/install.txt diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/binary.cpp b/3rdparty/yaml-cpp-0.8.0/src/binary.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/binary.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/binary.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/collectionstack.h b/3rdparty/yaml-cpp-0.8.0/src/collectionstack.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/collectionstack.h rename to 3rdparty/yaml-cpp-0.8.0/src/collectionstack.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/contrib/graphbuilder.cpp b/3rdparty/yaml-cpp-0.8.0/src/contrib/graphbuilder.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/contrib/graphbuilder.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/contrib/graphbuilder.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/contrib/graphbuilderadapter.cpp b/3rdparty/yaml-cpp-0.8.0/src/contrib/graphbuilderadapter.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/contrib/graphbuilderadapter.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/contrib/graphbuilderadapter.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/contrib/graphbuilderadapter.h b/3rdparty/yaml-cpp-0.8.0/src/contrib/graphbuilderadapter.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/contrib/graphbuilderadapter.h rename to 3rdparty/yaml-cpp-0.8.0/src/contrib/graphbuilderadapter.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/contrib/yaml-cpp.natvis b/3rdparty/yaml-cpp-0.8.0/src/contrib/yaml-cpp.natvis similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/contrib/yaml-cpp.natvis rename to 3rdparty/yaml-cpp-0.8.0/src/contrib/yaml-cpp.natvis diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/contrib/yaml-cpp.natvis.md b/3rdparty/yaml-cpp-0.8.0/src/contrib/yaml-cpp.natvis.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/contrib/yaml-cpp.natvis.md rename to 3rdparty/yaml-cpp-0.8.0/src/contrib/yaml-cpp.natvis.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/convert.cpp b/3rdparty/yaml-cpp-0.8.0/src/convert.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/convert.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/convert.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/depthguard.cpp b/3rdparty/yaml-cpp-0.8.0/src/depthguard.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/depthguard.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/depthguard.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/directives.cpp b/3rdparty/yaml-cpp-0.8.0/src/directives.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/directives.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/directives.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/directives.h b/3rdparty/yaml-cpp-0.8.0/src/directives.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/directives.h rename to 3rdparty/yaml-cpp-0.8.0/src/directives.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/emit.cpp b/3rdparty/yaml-cpp-0.8.0/src/emit.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/emit.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/emit.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/emitfromevents.cpp b/3rdparty/yaml-cpp-0.8.0/src/emitfromevents.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/emitfromevents.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/emitfromevents.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/emitter.cpp b/3rdparty/yaml-cpp-0.8.0/src/emitter.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/emitter.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/emitter.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/emitterstate.cpp b/3rdparty/yaml-cpp-0.8.0/src/emitterstate.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/emitterstate.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/emitterstate.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/emitterstate.h b/3rdparty/yaml-cpp-0.8.0/src/emitterstate.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/emitterstate.h rename to 3rdparty/yaml-cpp-0.8.0/src/emitterstate.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/emitterutils.cpp b/3rdparty/yaml-cpp-0.8.0/src/emitterutils.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/emitterutils.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/emitterutils.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/emitterutils.h b/3rdparty/yaml-cpp-0.8.0/src/emitterutils.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/emitterutils.h rename to 3rdparty/yaml-cpp-0.8.0/src/emitterutils.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/exceptions.cpp b/3rdparty/yaml-cpp-0.8.0/src/exceptions.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/exceptions.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/exceptions.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/exp.cpp b/3rdparty/yaml-cpp-0.8.0/src/exp.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/exp.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/exp.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/exp.h b/3rdparty/yaml-cpp-0.8.0/src/exp.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/exp.h rename to 3rdparty/yaml-cpp-0.8.0/src/exp.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/indentation.h b/3rdparty/yaml-cpp-0.8.0/src/indentation.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/indentation.h rename to 3rdparty/yaml-cpp-0.8.0/src/indentation.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/memory.cpp b/3rdparty/yaml-cpp-0.8.0/src/memory.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/memory.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/memory.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/node.cpp b/3rdparty/yaml-cpp-0.8.0/src/node.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/node.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/node.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/node_data.cpp b/3rdparty/yaml-cpp-0.8.0/src/node_data.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/node_data.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/node_data.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/nodebuilder.cpp b/3rdparty/yaml-cpp-0.8.0/src/nodebuilder.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/nodebuilder.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/nodebuilder.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/nodebuilder.h b/3rdparty/yaml-cpp-0.8.0/src/nodebuilder.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/nodebuilder.h rename to 3rdparty/yaml-cpp-0.8.0/src/nodebuilder.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/nodeevents.cpp b/3rdparty/yaml-cpp-0.8.0/src/nodeevents.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/nodeevents.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/nodeevents.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/nodeevents.h b/3rdparty/yaml-cpp-0.8.0/src/nodeevents.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/nodeevents.h rename to 3rdparty/yaml-cpp-0.8.0/src/nodeevents.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/null.cpp b/3rdparty/yaml-cpp-0.8.0/src/null.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/null.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/null.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/ostream_wrapper.cpp b/3rdparty/yaml-cpp-0.8.0/src/ostream_wrapper.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/ostream_wrapper.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/ostream_wrapper.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/parse.cpp b/3rdparty/yaml-cpp-0.8.0/src/parse.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/parse.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/parse.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/parser.cpp b/3rdparty/yaml-cpp-0.8.0/src/parser.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/parser.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/parser.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/ptr_vector.h b/3rdparty/yaml-cpp-0.8.0/src/ptr_vector.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/ptr_vector.h rename to 3rdparty/yaml-cpp-0.8.0/src/ptr_vector.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/regex_yaml.cpp b/3rdparty/yaml-cpp-0.8.0/src/regex_yaml.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/regex_yaml.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/regex_yaml.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/regex_yaml.h b/3rdparty/yaml-cpp-0.8.0/src/regex_yaml.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/regex_yaml.h rename to 3rdparty/yaml-cpp-0.8.0/src/regex_yaml.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/regeximpl.h b/3rdparty/yaml-cpp-0.8.0/src/regeximpl.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/regeximpl.h rename to 3rdparty/yaml-cpp-0.8.0/src/regeximpl.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/scanner.cpp b/3rdparty/yaml-cpp-0.8.0/src/scanner.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/scanner.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/scanner.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/scanner.h b/3rdparty/yaml-cpp-0.8.0/src/scanner.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/scanner.h rename to 3rdparty/yaml-cpp-0.8.0/src/scanner.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/scanscalar.cpp b/3rdparty/yaml-cpp-0.8.0/src/scanscalar.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/scanscalar.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/scanscalar.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/scanscalar.h b/3rdparty/yaml-cpp-0.8.0/src/scanscalar.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/scanscalar.h rename to 3rdparty/yaml-cpp-0.8.0/src/scanscalar.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/scantag.cpp b/3rdparty/yaml-cpp-0.8.0/src/scantag.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/scantag.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/scantag.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/scantag.h b/3rdparty/yaml-cpp-0.8.0/src/scantag.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/scantag.h rename to 3rdparty/yaml-cpp-0.8.0/src/scantag.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/scantoken.cpp b/3rdparty/yaml-cpp-0.8.0/src/scantoken.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/scantoken.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/scantoken.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/setting.h b/3rdparty/yaml-cpp-0.8.0/src/setting.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/setting.h rename to 3rdparty/yaml-cpp-0.8.0/src/setting.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/simplekey.cpp b/3rdparty/yaml-cpp-0.8.0/src/simplekey.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/simplekey.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/simplekey.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/singledocparser.cpp b/3rdparty/yaml-cpp-0.8.0/src/singledocparser.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/singledocparser.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/singledocparser.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/singledocparser.h b/3rdparty/yaml-cpp-0.8.0/src/singledocparser.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/singledocparser.h rename to 3rdparty/yaml-cpp-0.8.0/src/singledocparser.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/stream.cpp b/3rdparty/yaml-cpp-0.8.0/src/stream.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/stream.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/stream.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/stream.h b/3rdparty/yaml-cpp-0.8.0/src/stream.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/stream.h rename to 3rdparty/yaml-cpp-0.8.0/src/stream.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/streamcharsource.h b/3rdparty/yaml-cpp-0.8.0/src/streamcharsource.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/streamcharsource.h rename to 3rdparty/yaml-cpp-0.8.0/src/streamcharsource.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/stringsource.h b/3rdparty/yaml-cpp-0.8.0/src/stringsource.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/stringsource.h rename to 3rdparty/yaml-cpp-0.8.0/src/stringsource.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/tag.cpp b/3rdparty/yaml-cpp-0.8.0/src/tag.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/tag.cpp rename to 3rdparty/yaml-cpp-0.8.0/src/tag.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/tag.h b/3rdparty/yaml-cpp-0.8.0/src/tag.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/tag.h rename to 3rdparty/yaml-cpp-0.8.0/src/tag.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/src/token.h b/3rdparty/yaml-cpp-0.8.0/src/token.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/src/token.h rename to 3rdparty/yaml-cpp-0.8.0/src/token.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/BUILD.bazel b/3rdparty/yaml-cpp-0.8.0/test/BUILD.bazel similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/BUILD.bazel rename to 3rdparty/yaml-cpp-0.8.0/test/BUILD.bazel diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/CMakeLists.txt b/3rdparty/yaml-cpp-0.8.0/test/CMakeLists.txt similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/CMakeLists.txt rename to 3rdparty/yaml-cpp-0.8.0/test/CMakeLists.txt diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/binary_test.cpp b/3rdparty/yaml-cpp-0.8.0/test/binary_test.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/binary_test.cpp rename to 3rdparty/yaml-cpp-0.8.0/test/binary_test.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/create-emitter-tests.py b/3rdparty/yaml-cpp-0.8.0/test/create-emitter-tests.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/create-emitter-tests.py rename to 3rdparty/yaml-cpp-0.8.0/test/create-emitter-tests.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/.clang-format b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/.clang-format similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/.clang-format rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/.clang-format diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/.github/ISSUE_TEMPLATE/00-bug_report.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/.github/ISSUE_TEMPLATE/00-bug_report.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/.github/ISSUE_TEMPLATE/00-bug_report.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/.github/ISSUE_TEMPLATE/00-bug_report.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/.github/ISSUE_TEMPLATE/10-feature_request.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/.github/ISSUE_TEMPLATE/10-feature_request.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/.github/ISSUE_TEMPLATE/10-feature_request.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/.github/ISSUE_TEMPLATE/10-feature_request.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/.github/ISSUE_TEMPLATE/config.yml b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/.github/ISSUE_TEMPLATE/config.yml similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/.github/ISSUE_TEMPLATE/config.yml rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/.github/ISSUE_TEMPLATE/config.yml diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/.gitignore b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/.gitignore similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/.gitignore rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/.gitignore diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/BUILD.bazel b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/BUILD.bazel similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/BUILD.bazel rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/BUILD.bazel diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/CMakeLists.txt b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/CMakeLists.txt similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/CMakeLists.txt rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/CMakeLists.txt diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/CONTRIBUTING.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/CONTRIBUTING.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/CONTRIBUTING.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/CONTRIBUTING.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/CONTRIBUTORS b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/CONTRIBUTORS similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/CONTRIBUTORS rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/CONTRIBUTORS diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/LICENSE b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/LICENSE similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/LICENSE rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/LICENSE diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/README.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/README.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/README.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/README.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/WORKSPACE b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/WORKSPACE similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/WORKSPACE rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/WORKSPACE diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/ci/linux-presubmit.sh b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/ci/linux-presubmit.sh similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/ci/linux-presubmit.sh rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/ci/linux-presubmit.sh diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/ci/macos-presubmit.sh b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/ci/macos-presubmit.sh similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/ci/macos-presubmit.sh rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/ci/macos-presubmit.sh diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/_config.yml b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/_config.yml similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/_config.yml rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/_config.yml diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/_data/navigation.yml b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/_data/navigation.yml similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/_data/navigation.yml rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/_data/navigation.yml diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/_layouts/default.html b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/_layouts/default.html similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/_layouts/default.html rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/_layouts/default.html diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/_sass/main.scss b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/_sass/main.scss similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/_sass/main.scss rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/_sass/main.scss diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/advanced.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/advanced.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/advanced.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/advanced.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/assets/css/style.scss b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/assets/css/style.scss similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/assets/css/style.scss rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/assets/css/style.scss diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/community_created_documentation.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/community_created_documentation.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/community_created_documentation.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/community_created_documentation.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/faq.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/faq.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/faq.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/faq.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/gmock_cheat_sheet.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/gmock_cheat_sheet.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/gmock_cheat_sheet.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/gmock_cheat_sheet.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/gmock_cook_book.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/gmock_cook_book.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/gmock_cook_book.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/gmock_cook_book.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/gmock_faq.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/gmock_faq.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/gmock_faq.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/gmock_faq.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/gmock_for_dummies.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/gmock_for_dummies.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/gmock_for_dummies.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/gmock_for_dummies.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/index.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/index.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/index.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/index.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/pkgconfig.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/pkgconfig.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/pkgconfig.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/pkgconfig.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/platforms.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/platforms.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/platforms.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/platforms.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/primer.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/primer.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/primer.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/primer.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/quickstart-bazel.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/quickstart-bazel.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/quickstart-bazel.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/quickstart-bazel.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/quickstart-cmake.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/quickstart-cmake.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/quickstart-cmake.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/quickstart-cmake.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/reference/actions.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/reference/actions.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/reference/actions.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/reference/actions.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/reference/assertions.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/reference/assertions.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/reference/assertions.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/reference/assertions.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/reference/matchers.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/reference/matchers.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/reference/matchers.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/reference/matchers.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/reference/mocking.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/reference/mocking.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/reference/mocking.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/reference/mocking.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/reference/testing.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/reference/testing.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/reference/testing.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/reference/testing.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/samples.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/samples.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/samples.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/docs/samples.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/CMakeLists.txt b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/CMakeLists.txt similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/CMakeLists.txt rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/CMakeLists.txt diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/README.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/README.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/README.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/README.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/cmake/gmock.pc.in b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/cmake/gmock.pc.in similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/cmake/gmock.pc.in rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/cmake/gmock.pc.in diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/cmake/gmock_main.pc.in b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/cmake/gmock_main.pc.in similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/cmake/gmock_main.pc.in rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/cmake/gmock_main.pc.in diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/docs/README.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/docs/README.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/docs/README.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/docs/README.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-actions.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-actions.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-actions.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-actions.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-cardinalities.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-cardinalities.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-cardinalities.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-cardinalities.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-function-mocker.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-function-mocker.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-function-mocker.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-function-mocker.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-matchers.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-matchers.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-matchers.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-matchers.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-more-actions.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-more-actions.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-more-actions.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-more-actions.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-more-matchers.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-more-matchers.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-more-matchers.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-more-matchers.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-nice-strict.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-nice-strict.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-nice-strict.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-nice-strict.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-spec-builders.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-spec-builders.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-spec-builders.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock-spec-builders.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/gmock.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/custom/README.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/custom/README.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/custom/README.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/custom/README.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/custom/gmock-matchers.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/custom/gmock-matchers.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/custom/gmock-matchers.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/custom/gmock-matchers.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/custom/gmock-port.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/custom/gmock-port.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/custom/gmock-port.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/custom/gmock-port.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/gmock-internal-utils.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/gmock-internal-utils.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/gmock-internal-utils.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/gmock-internal-utils.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/gmock-port.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/gmock-port.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/gmock-port.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/gmock-port.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/gmock-pp.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/gmock-pp.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/gmock-pp.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/include/gmock/internal/gmock-pp.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/README.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/README.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/README.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/README.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/fuse_gmock_files.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/fuse_gmock_files.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/fuse_gmock_files.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/fuse_gmock_files.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/LICENSE b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/LICENSE similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/LICENSE rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/LICENSE diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/README b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/README similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/README rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/README diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/README.cppclean b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/README.cppclean similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/README.cppclean rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/README.cppclean diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/__init__.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/__init__.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/__init__.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/__init__.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/ast.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/ast.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/ast.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/ast.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/gmock_class.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/gmock_class.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/gmock_class.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/gmock_class.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/gmock_class_test.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/gmock_class_test.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/gmock_class_test.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/gmock_class_test.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/keywords.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/keywords.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/keywords.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/keywords.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/tokenize.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/tokenize.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/tokenize.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/tokenize.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/utils.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/utils.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/utils.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/cpp/utils.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/gmock_gen.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/gmock_gen.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/gmock_gen.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/scripts/generator/gmock_gen.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock-all.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock-all.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock-all.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock-all.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock-cardinalities.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock-cardinalities.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock-cardinalities.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock-cardinalities.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock-internal-utils.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock-internal-utils.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock-internal-utils.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock-internal-utils.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock-matchers.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock-matchers.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock-matchers.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock-matchers.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock-spec-builders.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock-spec-builders.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock-spec-builders.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock-spec-builders.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock_main.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock_main.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock_main.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/src/gmock_main.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/BUILD.bazel b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/BUILD.bazel similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/BUILD.bazel rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/BUILD.bazel diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-actions_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-actions_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-actions_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-actions_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-cardinalities_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-cardinalities_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-cardinalities_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-cardinalities_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-function-mocker_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-function-mocker_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-function-mocker_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-function-mocker_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-internal-utils_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-internal-utils_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-internal-utils_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-internal-utils_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-matchers_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-matchers_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-matchers_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-matchers_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-more-actions_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-more-actions_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-more-actions_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-more-actions_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-nice-strict_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-nice-strict_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-nice-strict_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-nice-strict_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-port_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-port_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-port_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-port_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-pp-string_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-pp-string_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-pp-string_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-pp-string_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-pp_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-pp_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-pp_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-pp_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-spec-builders_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-spec-builders_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-spec-builders_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock-spec-builders_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_all_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_all_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_all_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_all_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_ex_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_ex_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_ex_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_ex_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_leak_test.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_leak_test.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_leak_test.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_leak_test.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_leak_test_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_leak_test_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_leak_test_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_leak_test_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_link2_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_link2_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_link2_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_link2_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_link_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_link_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_link_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_link_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_link_test.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_link_test.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_link_test.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_link_test.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_output_test.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_output_test.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_output_test.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_output_test.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_output_test_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_output_test_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_output_test_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_output_test_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_output_test_golden.txt b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_output_test_golden.txt similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_output_test_golden.txt rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_output_test_golden.txt diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_stress_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_stress_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_stress_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_stress_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_test_utils.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_test_utils.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_test_utils.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googlemock/test/gmock_test_utils.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/CMakeLists.txt b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/CMakeLists.txt similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/CMakeLists.txt rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/CMakeLists.txt diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/README.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/README.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/README.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/README.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/cmake/Config.cmake.in b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/cmake/Config.cmake.in similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/cmake/Config.cmake.in rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/cmake/Config.cmake.in diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/cmake/gtest.pc.in b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/cmake/gtest.pc.in similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/cmake/gtest.pc.in rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/cmake/gtest.pc.in diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/cmake/gtest_main.pc.in b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/cmake/gtest_main.pc.in similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/cmake/gtest_main.pc.in rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/cmake/gtest_main.pc.in diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/cmake/internal_utils.cmake b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/cmake/internal_utils.cmake similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/cmake/internal_utils.cmake rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/cmake/internal_utils.cmake diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/cmake/libgtest.la.in b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/cmake/libgtest.la.in similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/cmake/libgtest.la.in rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/cmake/libgtest.la.in diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/docs/README.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/docs/README.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/docs/README.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/docs/README.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-death-test.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-death-test.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-death-test.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-death-test.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-matchers.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-matchers.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-matchers.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-matchers.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-message.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-message.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-message.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-message.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-param-test.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-param-test.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-param-test.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-param-test.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-printers.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-printers.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-printers.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-printers.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-spi.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-spi.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-spi.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-spi.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-test-part.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-test-part.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-test-part.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-test-part.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-typed-test.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-typed-test.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-typed-test.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest-typed-test.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest_pred_impl.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest_pred_impl.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest_pred_impl.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest_pred_impl.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest_prod.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest_prod.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest_prod.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/gtest_prod.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/custom/README.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/custom/README.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/custom/README.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/custom/README.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/custom/gtest-port.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/custom/gtest-port.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/custom/gtest-port.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/custom/gtest-port.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/custom/gtest-printers.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/custom/gtest-printers.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/custom/gtest-printers.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/custom/gtest-printers.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/custom/gtest.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/custom/gtest.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/custom/gtest.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/custom/gtest.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-death-test-internal.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-death-test-internal.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-death-test-internal.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-death-test-internal.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-filepath.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-filepath.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-filepath.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-filepath.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-internal.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-internal.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-internal.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-internal.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-param-util.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-param-util.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-param-util.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-param-util.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-port-arch.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-port-arch.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-port-arch.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-port-arch.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-port.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-port.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-port.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-port.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-string.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-string.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-string.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-string.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-type-util.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-type-util.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-type-util.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/include/gtest/internal/gtest-type-util.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/prime_tables.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/prime_tables.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/prime_tables.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/prime_tables.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample1.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample1.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample1.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample1.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample1.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample1.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample1.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample1.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample10_unittest.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample10_unittest.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample10_unittest.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample10_unittest.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample1_unittest.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample1_unittest.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample1_unittest.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample1_unittest.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample2.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample2.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample2.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample2.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample2.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample2.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample2.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample2.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample2_unittest.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample2_unittest.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample2_unittest.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample2_unittest.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample3-inl.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample3-inl.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample3-inl.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample3-inl.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample3_unittest.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample3_unittest.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample3_unittest.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample3_unittest.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample4.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample4.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample4.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample4.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample4.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample4.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample4.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample4.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample4_unittest.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample4_unittest.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample4_unittest.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample4_unittest.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample5_unittest.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample5_unittest.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample5_unittest.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample5_unittest.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample6_unittest.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample6_unittest.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample6_unittest.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample6_unittest.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample7_unittest.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample7_unittest.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample7_unittest.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample7_unittest.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample8_unittest.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample8_unittest.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample8_unittest.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample8_unittest.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample9_unittest.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample9_unittest.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample9_unittest.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/samples/sample9_unittest.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/README.md b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/README.md similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/README.md rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/README.md diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/common.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/common.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/common.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/common.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/fuse_gtest_files.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/fuse_gtest_files.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/fuse_gtest_files.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/fuse_gtest_files.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/gen_gtest_pred_impl.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/gen_gtest_pred_impl.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/gen_gtest_pred_impl.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/gen_gtest_pred_impl.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/gtest-config.in b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/gtest-config.in similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/gtest-config.in rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/gtest-config.in diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/release_docs.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/release_docs.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/release_docs.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/release_docs.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/run_with_path.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/run_with_path.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/run_with_path.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/run_with_path.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/upload.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/upload.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/upload.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/upload.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/upload_gtest.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/upload_gtest.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/upload_gtest.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/scripts/upload_gtest.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-all.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-all.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-all.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-all.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-death-test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-death-test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-death-test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-death-test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-filepath.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-filepath.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-filepath.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-filepath.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-internal-inl.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-internal-inl.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-internal-inl.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-internal-inl.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-matchers.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-matchers.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-matchers.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-matchers.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-port.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-port.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-port.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-port.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-printers.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-printers.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-printers.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-printers.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-test-part.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-test-part.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-test-part.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-test-part.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-typed-test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-typed-test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-typed-test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest-typed-test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest_main.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest_main.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest_main.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/src/gtest_main.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/BUILD.bazel b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/BUILD.bazel similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/BUILD.bazel rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/BUILD.bazel diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-break-on-failure-unittest.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-break-on-failure-unittest.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-break-on-failure-unittest.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-break-on-failure-unittest.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-break-on-failure-unittest_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-break-on-failure-unittest_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-break-on-failure-unittest_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-break-on-failure-unittest_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-catch-exceptions-test.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-catch-exceptions-test.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-catch-exceptions-test.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-catch-exceptions-test.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-catch-exceptions-test_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-catch-exceptions-test_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-catch-exceptions-test_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-catch-exceptions-test_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-color-test.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-color-test.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-color-test.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-color-test.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-color-test_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-color-test_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-color-test_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-color-test_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-death-test-test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-death-test-test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-death-test-test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-death-test-test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-death-test_ex_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-death-test_ex_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-death-test_ex_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-death-test_ex_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-env-var-test.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-env-var-test.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-env-var-test.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-env-var-test.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-env-var-test_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-env-var-test_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-env-var-test_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-env-var-test_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-failfast-unittest.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-failfast-unittest.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-failfast-unittest.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-failfast-unittest.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-failfast-unittest_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-failfast-unittest_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-failfast-unittest_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-failfast-unittest_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-filepath-test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-filepath-test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-filepath-test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-filepath-test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-filter-unittest.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-filter-unittest.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-filter-unittest.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-filter-unittest.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-filter-unittest_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-filter-unittest_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-filter-unittest_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-filter-unittest_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-global-environment-unittest.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-global-environment-unittest.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-global-environment-unittest.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-global-environment-unittest.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-global-environment-unittest_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-global-environment-unittest_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-global-environment-unittest_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-global-environment-unittest_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-json-outfiles-test.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-json-outfiles-test.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-json-outfiles-test.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-json-outfiles-test.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-json-output-unittest.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-json-output-unittest.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-json-output-unittest.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-json-output-unittest.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-list-tests-unittest.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-list-tests-unittest.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-list-tests-unittest.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-list-tests-unittest.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-list-tests-unittest_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-list-tests-unittest_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-list-tests-unittest_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-list-tests-unittest_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-listener-test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-listener-test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-listener-test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-listener-test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-message-test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-message-test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-message-test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-message-test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-options-test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-options-test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-options-test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-options-test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-output-test-golden-lin.txt b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-output-test-golden-lin.txt similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-output-test-golden-lin.txt rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-output-test-golden-lin.txt diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-output-test.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-output-test.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-output-test.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-output-test.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-output-test_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-output-test_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-output-test_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-output-test_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-invalid-name1-test.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-invalid-name1-test.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-invalid-name1-test.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-invalid-name1-test.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-invalid-name1-test_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-invalid-name1-test_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-invalid-name1-test_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-invalid-name1-test_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-invalid-name2-test.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-invalid-name2-test.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-invalid-name2-test.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-invalid-name2-test.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-invalid-name2-test_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-invalid-name2-test_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-invalid-name2-test_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-invalid-name2-test_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-test.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-test.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-test.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test-test.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test2-test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test2-test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test2-test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-param-test2-test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-port-test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-port-test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-port-test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-port-test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-printers-test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-printers-test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-printers-test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-printers-test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-setuptestsuite-test.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-setuptestsuite-test.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-setuptestsuite-test.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-setuptestsuite-test.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-setuptestsuite-test_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-setuptestsuite-test_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-setuptestsuite-test_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-setuptestsuite-test_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-shuffle-test.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-shuffle-test.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-shuffle-test.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-shuffle-test.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-shuffle-test_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-shuffle-test_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-shuffle-test_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-shuffle-test_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-test-part-test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-test-part-test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-test-part-test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-test-part-test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-throw-on-failure-test.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-throw-on-failure-test.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-throw-on-failure-test.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-throw-on-failure-test.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-throw-on-failure-test_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-throw-on-failure-test_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-throw-on-failure-test_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-throw-on-failure-test_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-uninitialized-test.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-uninitialized-test.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-uninitialized-test.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-uninitialized-test.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-uninitialized-test_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-uninitialized-test_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-uninitialized-test_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/googletest-uninitialized-test_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest-typed-test2_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest-typed-test2_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest-typed-test2_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest-typed-test2_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest-typed-test_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest-typed-test_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest-typed-test_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest-typed-test_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest-typed-test_test.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest-typed-test_test.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest-typed-test_test.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest-typed-test_test.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest-unittest-api_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest-unittest-api_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest-unittest-api_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest-unittest-api_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_all_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_all_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_all_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_all_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_assert_by_exception_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_assert_by_exception_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_assert_by_exception_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_assert_by_exception_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_environment_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_environment_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_environment_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_environment_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_help_test.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_help_test.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_help_test.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_help_test.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_help_test_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_help_test_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_help_test_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_help_test_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_json_test_utils.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_json_test_utils.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_json_test_utils.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_json_test_utils.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_list_output_unittest.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_list_output_unittest.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_list_output_unittest.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_list_output_unittest.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_list_output_unittest_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_list_output_unittest_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_list_output_unittest_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_list_output_unittest_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_main_unittest.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_main_unittest.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_main_unittest.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_main_unittest.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_no_test_unittest.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_no_test_unittest.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_no_test_unittest.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_no_test_unittest.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_pred_impl_unittest.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_pred_impl_unittest.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_pred_impl_unittest.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_pred_impl_unittest.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_premature_exit_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_premature_exit_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_premature_exit_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_premature_exit_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_prod_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_prod_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_prod_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_prod_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_repeat_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_repeat_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_repeat_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_repeat_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_skip_check_output_test.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_skip_check_output_test.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_skip_check_output_test.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_skip_check_output_test.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_skip_environment_check_output_test.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_skip_environment_check_output_test.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_skip_environment_check_output_test.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_skip_environment_check_output_test.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_skip_in_environment_setup_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_skip_in_environment_setup_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_skip_in_environment_setup_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_skip_in_environment_setup_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_skip_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_skip_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_skip_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_skip_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_sole_header_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_sole_header_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_sole_header_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_sole_header_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_stress_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_stress_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_stress_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_stress_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_test_macro_stack_footprint_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_test_macro_stack_footprint_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_test_macro_stack_footprint_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_test_macro_stack_footprint_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_test_utils.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_test_utils.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_test_utils.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_test_utils.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_testbridge_test.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_testbridge_test.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_testbridge_test.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_testbridge_test.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_testbridge_test_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_testbridge_test_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_testbridge_test_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_testbridge_test_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_throw_on_failure_ex_test.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_throw_on_failure_ex_test.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_throw_on_failure_ex_test.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_throw_on_failure_ex_test.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_unittest.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_unittest.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_unittest.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_unittest.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_outfile1_test_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_outfile1_test_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_outfile1_test_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_outfile1_test_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_outfile2_test_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_outfile2_test_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_outfile2_test_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_outfile2_test_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_outfiles_test.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_outfiles_test.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_outfiles_test.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_outfiles_test.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_output_unittest.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_output_unittest.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_output_unittest.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_output_unittest.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_output_unittest_.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_output_unittest_.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_output_unittest_.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_output_unittest_.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_test_utils.py b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_test_utils.py similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_test_utils.py rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/gtest_xml_test_utils.py diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/production.cc b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/production.cc similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/production.cc rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/production.cc diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/production.h b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/production.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/production.h rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/googletest/test/production.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/library.json b/3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/library.json similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/gtest-1.11.0/library.json rename to 3rdparty/yaml-cpp-0.8.0/test/gtest-1.11.0/library.json diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/handler_test.h b/3rdparty/yaml-cpp-0.8.0/test/handler_test.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/handler_test.h rename to 3rdparty/yaml-cpp-0.8.0/test/handler_test.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/integration/emitter_test.cpp b/3rdparty/yaml-cpp-0.8.0/test/integration/emitter_test.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/integration/emitter_test.cpp rename to 3rdparty/yaml-cpp-0.8.0/test/integration/emitter_test.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/integration/encoding_test.cpp b/3rdparty/yaml-cpp-0.8.0/test/integration/encoding_test.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/integration/encoding_test.cpp rename to 3rdparty/yaml-cpp-0.8.0/test/integration/encoding_test.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/integration/error_messages_test.cpp b/3rdparty/yaml-cpp-0.8.0/test/integration/error_messages_test.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/integration/error_messages_test.cpp rename to 3rdparty/yaml-cpp-0.8.0/test/integration/error_messages_test.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/integration/gen_emitter_test.cpp b/3rdparty/yaml-cpp-0.8.0/test/integration/gen_emitter_test.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/integration/gen_emitter_test.cpp rename to 3rdparty/yaml-cpp-0.8.0/test/integration/gen_emitter_test.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/integration/handler_spec_test.cpp b/3rdparty/yaml-cpp-0.8.0/test/integration/handler_spec_test.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/integration/handler_spec_test.cpp rename to 3rdparty/yaml-cpp-0.8.0/test/integration/handler_spec_test.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/integration/handler_test.cpp b/3rdparty/yaml-cpp-0.8.0/test/integration/handler_test.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/integration/handler_test.cpp rename to 3rdparty/yaml-cpp-0.8.0/test/integration/handler_test.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/integration/load_node_test.cpp b/3rdparty/yaml-cpp-0.8.0/test/integration/load_node_test.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/integration/load_node_test.cpp rename to 3rdparty/yaml-cpp-0.8.0/test/integration/load_node_test.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/integration/node_spec_test.cpp b/3rdparty/yaml-cpp-0.8.0/test/integration/node_spec_test.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/integration/node_spec_test.cpp rename to 3rdparty/yaml-cpp-0.8.0/test/integration/node_spec_test.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/main.cpp b/3rdparty/yaml-cpp-0.8.0/test/main.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/main.cpp rename to 3rdparty/yaml-cpp-0.8.0/test/main.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/mock_event_handler.h b/3rdparty/yaml-cpp-0.8.0/test/mock_event_handler.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/mock_event_handler.h rename to 3rdparty/yaml-cpp-0.8.0/test/mock_event_handler.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/node/node_test.cpp b/3rdparty/yaml-cpp-0.8.0/test/node/node_test.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/node/node_test.cpp rename to 3rdparty/yaml-cpp-0.8.0/test/node/node_test.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/ostream_wrapper_test.cpp b/3rdparty/yaml-cpp-0.8.0/test/ostream_wrapper_test.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/ostream_wrapper_test.cpp rename to 3rdparty/yaml-cpp-0.8.0/test/ostream_wrapper_test.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/parser_test.cpp b/3rdparty/yaml-cpp-0.8.0/test/parser_test.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/parser_test.cpp rename to 3rdparty/yaml-cpp-0.8.0/test/parser_test.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/regex_test.cpp b/3rdparty/yaml-cpp-0.8.0/test/regex_test.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/regex_test.cpp rename to 3rdparty/yaml-cpp-0.8.0/test/regex_test.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/test/specexamples.h b/3rdparty/yaml-cpp-0.8.0/test/specexamples.h similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/test/specexamples.h rename to 3rdparty/yaml-cpp-0.8.0/test/specexamples.h diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/util/CMakeLists.txt b/3rdparty/yaml-cpp-0.8.0/util/CMakeLists.txt similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/util/CMakeLists.txt rename to 3rdparty/yaml-cpp-0.8.0/util/CMakeLists.txt diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/util/api.cpp b/3rdparty/yaml-cpp-0.8.0/util/api.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/util/api.cpp rename to 3rdparty/yaml-cpp-0.8.0/util/api.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/util/parse.cpp b/3rdparty/yaml-cpp-0.8.0/util/parse.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/util/parse.cpp rename to 3rdparty/yaml-cpp-0.8.0/util/parse.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/util/read.cpp b/3rdparty/yaml-cpp-0.8.0/util/read.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/util/read.cpp rename to 3rdparty/yaml-cpp-0.8.0/util/read.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/util/sandbox.cpp b/3rdparty/yaml-cpp-0.8.0/util/sandbox.cpp similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/util/sandbox.cpp rename to 3rdparty/yaml-cpp-0.8.0/util/sandbox.cpp diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/yaml-cpp-config.cmake.in b/3rdparty/yaml-cpp-0.8.0/yaml-cpp-config.cmake.in similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/yaml-cpp-config.cmake.in rename to 3rdparty/yaml-cpp-0.8.0/yaml-cpp-config.cmake.in diff --git a/libs/yaml-cpp/yaml-cpp-0.8.0/yaml-cpp.pc.in b/3rdparty/yaml-cpp-0.8.0/yaml-cpp.pc.in similarity index 100% rename from libs/yaml-cpp/yaml-cpp-0.8.0/yaml-cpp.pc.in rename to 3rdparty/yaml-cpp-0.8.0/yaml-cpp.pc.in diff --git a/CHANGELOG.md b/CHANGELOG.md index bddf96a5..40d871a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## [1.1.0] - +## [1.1.0] - 2024-12-18 ### BREAKING CHANGE - Track duration is now in milliseconds. It will be converted from seconds to milliseconds upon loading playlists from local config. Previous versions won't be able to work with updated config. To use old version after launching the new one you'll have to remove all playlists, or manually divide duration by 1000 in local config @@ -8,6 +8,7 @@ - unpause after a long pause in Qt6 on Linux/ffmpeg sometimes caused no sound ### Misc +- switch to CMake - update built-in Taglib to 2.0.2 and Yaml cpp to 0.8.0 - fix deprecation warnings - C++17 diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 00000000..e8742f31 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,282 @@ +cmake_minimum_required(VERSION 3.10) + +project(mpz VERSION 1.1.0 LANGUAGES CXX) +ADD_DEFINITIONS(-DVERSION="${PROJECT_VERSION}") + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED True) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) + +OPTION(USE_QT5, "Use Qt5, the default is Qt6" OFF) +if (USE_QT5) + find_package(QT NAMES Qt5 REQUIRED COMPONENTS Core) +else() + find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core) +endif() +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Multimedia) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Concurrent) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Network) +if (UNIX AND NOT APPLE) + set(ENABLE_DBUS True) + find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS DBus) +endif() + + +set(PROJECT_SOURCES + app/about_ui/aboutdialog.cpp + app/audio_device_ui/devicesmenu.cpp + app/busyspinner.cpp + app/config/global.cpp + app/config/local.cpp + app/config/storage.cpp + app/config/value.cpp + app/coverart/embedded.cpp + app/directory_ui/directorycontroller.cpp + app/directory_ui/directorysettings.cpp + app/feedback_ui/feedbackform.cpp + app/ipc/instance.cpp + app/main.cpp + app/mainmenu.cpp + app/mainwindow.cpp + app/directory_ui/directorymodel.cpp + app/playback/controls.cpp + app/playback/dispatch.cpp + app/playback/mediaplayer.cpp + app/playback/playbackcontroller.cpp + app/playback/randomtrail.cpp + app/playback_log_ui/playbacklogdialog.cpp + app/playback_log_ui/playbackloguicontroller.cpp + app/playback_log_ui/playbackloguimodel.cpp + app/coverart/covers.cpp + app/playlist/cueparser.cpp + app/playlist/fileparser.cpp + app/playlist/loader.cpp + app/playlist/sorter.cpp + app/playlist_ui/columnsconfig.cpp + app/playlist_ui/playlistcontroller.cpp + app/playlist_ui/playlistmodel.cpp + app/playlist/playlist.cpp + app/playback/playerstate.cpp + app/playlist_ui/playlistproxyfiltermodel.cpp + app/playlist_ui/playlistcontextmenu.cpp + app/playlist_ui/trackinfodialog.cpp + app/playlists_ui/playlistscontextmenu.cpp + app/directory_ui/directorycontextmenu.cpp + app/directory_ui/directorysortmenu.cpp + app/playlists_ui/playlistscontroller.cpp + app/playlists_ui/playlistsmodel.cpp + app/playlists_ui/playlistsproxyfiltermodel.cpp + app/rnjesus.cpp + app/shortcuts.cpp + app/shortcuts_ui/shortcutsdialog.cpp + app/sleeplock.cpp + app/sort_ui/sortingpresetsdialog.cpp + app/sort_ui/sortmenu.cpp + app/statusbarlabel.cpp + app/sysinfo.cpp + app/track.cpp + app/trayicon.cpp + app/volumecontrol.cpp + app/playback/stream.cpp + app/streammetadata.cpp + app/about_ui/aboutdialog.ui + app/directory_ui/directorysettings.ui + app/feedback_ui/feedbackform.ui + app/mainwindow.ui + app/playback_log_ui/playbacklogdialog.ui + app/playlist_ui/trackinfodialog.ui + app/shortcuts_ui/shortcutsdialog.ui + app/sort_ui/sortingpresets.ui + resources.qrc +) + +if (ENABLE_DBUS) + ADD_DEFINITIONS(-DMPRIS_ENABLE) + list(APPEND PROJECT_SOURCES app/dbus/mpris.cpp) + if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) + qt_add_dbus_adaptor(PROJECT_SOURCES app/dbus/org.mpris.MediaPlayer2.xml dbus/mpris.h Mpris) + qt_add_dbus_adaptor(PROJECT_SOURCES app/dbus/org.mpris.MediaPlayer2.Player.xml dbus/mpris.h Mpris) + else() + qt5_add_dbus_adaptor(PROJECT_SOURCES app/dbus/org.mpris.MediaPlayer2.xml dbus/mpris.h Mpris) + qt5_add_dbus_adaptor(PROJECT_SOURCES app/dbus/org.mpris.MediaPlayer2.Player.xml dbus/mpris.h Mpris) + endif() +endif() + +if (WIN32) + enable_language("RC") + list(APPEND PROJECT_SOURCES app/resources/icons/mpz.rc) +endif() + +if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) + qt_add_executable(${CMAKE_PROJECT_NAME} MANUAL_FINALIZATION ${PROJECT_SOURCES}) + message(STATUS "using Qt6") +else() + add_executable(${CMAKE_PROJECT_NAME} ${PROJECT_SOURCES}) + message(STATUS "using Qt5") +endif() + +target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Qt${QT_VERSION_MAJOR}::Widgets) +target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Qt${QT_VERSION_MAJOR}::Multimedia) +target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Qt${QT_VERSION_MAJOR}::Core) +target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Qt${QT_VERSION_MAJOR}::Network) +target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Qt${QT_VERSION_MAJOR}::Concurrent) +if (ENABLE_DBUS) + target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Qt${QT_VERSION_MAJOR}::DBus) +endif() + +target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/app) +target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") + +# Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1. +# If you are developing for iOS or macOS you should consider setting an +# explicit, fixed bundle identifier manually though. +if(${QT_VERSION} VERSION_LESS 6.1.0) + set(BUNDLE_ID_OPTION MACOSX_BUNDLE_GUI_IDENTIFIER com.example.qtcmake) +endif() +set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES + ${BUNDLE_ID_OPTION} + MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} + MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} + MACOSX_BUNDLE TRUE + WIN32_EXECUTABLE TRUE +) + + + + + + + + + + + + +# 3RDPATY +if(NOT DEFINED _DISABLE_INSTALLATION) + # This variable is responsible for installation disabling. + set(_DISABLE_INSTALLATION FALSE) + # Replace install() with conditional installation. + macro(install) + if (NOT _DISABLE_INSTALLATION) + _install(${ARGN}) + endif() + endmacro() +endif() +set(_DISABLE_INSTALLATION TRUE) + +# YAML-CPP +OPTION(USE_SYSTEM_YAMLCPP, "Use Yaml-cpp provided by the OS" OFF) +target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE yaml-cpp) +if(USE_SYSTEM_YAMLCPP) + message(STATUS "using system-wide yaml-cpp") +else() + set(YAMLCPP_DIR 3rdparty/yaml-cpp-0.8.0) + message(STATUS "using vendored yaml-cpp from ${YAMLCPP_DIR}") + add_subdirectory(${YAMLCPP_DIR}) +endif() +# ENDOF YAML-CPP + +# TAGLIB +OPTION(USE_SYSTEM_TAGLIB "Use Taglib provided by the OS" OFF) +target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE tag) +if (USE_SYSTEM_TAGLIB) + message(STATUS "using system-wide taglib") + ADD_DEFINITIONS(-DUSE_SYSTEM_TAGLIB) +else() + set(utf8cpp_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/utfcpp-4.0.6/source) # dependency required by taglib + set(TAGLIB_DIR 3rdparty/taglib-2.0.2) + message(STATUS "using vendored taglib from ${TAGLIB_DIR}") + ADD_DEFINITIONS(-DTAGLIB_STATIC) + add_subdirectory(${TAGLIB_DIR}) + target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE + ${TAGLIB_DIR} + ${TAGLIB_DIR}/taglib + ${TAGLIB_DIR}/taglib/ape + ${TAGLIB_DIR}/taglib/asf + ${TAGLIB_DIR}/taglib/dsdiff + ${TAGLIB_DIR}/taglib/dsf + ${TAGLIB_DIR}/taglib/flac + ${TAGLIB_DIR}/taglib/it + ${TAGLIB_DIR}/taglib/mod + ${TAGLIB_DIR}/taglib/mp4 + ${TAGLIB_DIR}/taglib/mpeg + ${TAGLIB_DIR}/taglib/mpeg/id3v1 + ${TAGLIB_DIR}/taglib/mpeg/id3v2 + ${TAGLIB_DIR}/taglib/mpeg/id3v2/frames + ${TAGLIB_DIR}/taglib/ogg + ${TAGLIB_DIR}/taglib/ogg/flac + ${TAGLIB_DIR}/taglib/ogg/opus + ${TAGLIB_DIR}/taglib/ogg/speex + ${TAGLIB_DIR}/taglib/ogg/vorbis + ${TAGLIB_DIR}/taglib/riff + ${TAGLIB_DIR}/taglib/riff/aiff + ${TAGLIB_DIR}/taglib/riff/wav + ${TAGLIB_DIR}/taglib/s3m + ${TAGLIB_DIR}/taglib/toolkit + ${TAGLIB_DIR}/taglib/trueaudio + ${TAGLIB_DIR}/taglib/wavpack + ${TAGLIB_DIR}/taglib/xm + ) +endif() +# ENDOF TAGLIB + +# QHOTKEY +target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE qhotkey) +set(QHOTKEY_DIR 3rdparty/QHotkey-1.5.0) +add_subdirectory(${QHOTKEY_DIR}) +message(STATUS "using vendored qhotkey from ${QHOTKEY_DIR}") +# ENDOF QHOTKEY + +# QTWAITINGSPINNER +set(QTWAITINGSPINNER_DIR 3rdparty/qtwaitingspinner) +add_library(qtwaitingspinner ${QTWAITINGSPINNER_DIR}/waitingspinnerwidget.cpp) +target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${QTWAITINGSPINNER_DIR}) +target_link_libraries(qtwaitingspinner PRIVATE Qt${QT_VERSION_MAJOR}::Widgets) +target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE qtwaitingspinner) +# ENDOF QTWAITINGSPINNER + +set(_DISABLE_INSTALLATION FALSE) +# ENDOF 3RDPATY + + + + + + + + + + + + + +include(GNUInstallDirs) +install(TARGETS ${CMAKE_PROJECT_NAME} + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) +install(FILES mpz.desktop DESTINATION share/applications) +install(FILES app/resources/icons/512x512/mpz.png DESTINATION share/icons/hicolor/512x512/apps/) +install(FILES app/resources/icons/256x256/mpz.png DESTINATION share/icons/hicolor/256x256/apps/) +install(FILES app/resources/icons/192x192/mpz.png DESTINATION share/icons/hicolor/192x192/apps/) +install(FILES app/resources/icons/128x128/mpz.png DESTINATION share/icons/hicolor/128x128/apps/) +install(FILES app/resources/icons/96x96/mpz.png DESTINATION share/icons/hicolor/96x96/apps/) +install(FILES app/resources/icons/72x72/mpz.png DESTINATION share/icons/hicolor/72x72/apps/) +install(FILES app/resources/icons/64x64/mpz.png DESTINATION share/icons/hicolor/64x64/apps/) +install(FILES app/resources/icons/48x48/mpz.png DESTINATION share/icons/hicolor/48x48/apps/) +install(FILES app/resources/icons/32x32/mpz.png DESTINATION share/icons/hicolor/32x32/apps/) +install(FILES app/resources/icons/24x24/mpz.png DESTINATION share/icons/hicolor/24x24/apps/) +install(FILES app/resources/icons/22x22/mpz.png DESTINATION share/icons/hicolor/22x22/apps/) +install(FILES app/resources/icons/16x16/mpz.png DESTINATION share/icons/hicolor/16x16/apps/) +install(FILES license.txt DESTINATION share/licenses/${CMAKE_PROJECT_NAME}) + + +if(QT_VERSION_MAJOR EQUAL 6) + qt_finalize_executable(${CMAKE_PROJECT_NAME}) +endif() diff --git a/README.md b/README.md index 98aec3f1..6cb6f462 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Why "big local collections"? "Local" opposed to streaming services (which are fi Starting at Qt 6.4, QtMultimedia supports ffmpeg backend on Linux. You can enable it via environment variable QT_MEDIA_BACKEND: `QT_MEDIA_BACKEND=ffmpeg mpz`. -NOTE: currently on openSUSE Tumbleweed they seem to be using ffmpeg by default and this may cause issues. You can switch to gstreamer via the same environment variable `QT_MEDIA_BACKEND=gstreamer mpz` +NOTE: currently on openSUSE Tumbleweed (~ year 2024) they seem to be using ffmpeg by default and this may cause issues. You can switch to gstreamer via the same environment variable `QT_MEDIA_BACKEND=gstreamer mpz`. ## Installation @@ -73,25 +73,25 @@ git clone git@github.com:olegantonyan/mpz.git cd mpz mkdir build cd build -qmake6 CONFIG+=release .. # use qmake-qt5 instead of qmake6 for Qt5 +cmake -DCMAKE_BUILD_TYPE=Release .. # for Qt5 add -DUSE_QT5 make -j`nproc` -# now you now use app/mpz binary directly -# optionally, install to /usr: +# now you now use mpz binary directly +# optionally, install to /usr/local: sudo make install ``` You can also link against shared libraries Taglib and/or Yaml-cpp installed on your OS instead of using vendored statically compiled versions. -To do this you have to add `DEFINES+=USE_SYSTEM_TAGLIB DEFINES+=USE_SYSTEM_YAMLCPP` to qmake cli. +To do this you have to add `-DUSE_SYSTEM_TAGLIB=ON -DUSE_SYSTEM_YAMLCPP=ON` to cmake cli. ``` git clone git@github.com:olegantonyan/mpz.git cd mpz mkdir build cd build -qmake6 CONFIG+=release DEFINES+=USE_SYSTEM_TAGLIB DEFINES+=USE_SYSTEM_YAMLCPP .. +cmake -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_TAGLIB=ON -DUSE_SYSTEM_YAMLCPP=ON .. make -j`nproc` -# now you now use app/mpz binary directly -# optionally, install to /usr: +# now you now use mpz binary directly +# optionally, install to /usr/local: sudo make install ``` diff --git a/RELEASE.txt b/RELEASE.txt index 5731929b..f4e49a47 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1,5 +1,5 @@ 1. Commit all the changes -2. Change version in: version.pri, deb/mpz.dsc, rpm/mpz.spec +2. Change version in: CMakeLists.txt, deb/mpz.dsc, rpm/mpz.spec 3. Write changelog 4. Commit these changes with message "bump version to ..." 5. Build for windows: ./win/build_win32.sh && ./win/build_win64.sh and attach exe to the release diff --git a/app/app.pro b/app/app.pro deleted file mode 100644 index 28debf8c..00000000 --- a/app/app.pro +++ /dev/null @@ -1,218 +0,0 @@ -QT += widgets core gui multimedia concurrent network - -CONFIG += c++17 - -TARGET = mpz - -win32: { - CONFIG -= debug_and_release - #CONFIG += static - #QMAKE_LFLAGS += -static -} - - -include(../version.pri) - -RC_ICONS = resources/icons/mpz.ico - -# The following define makes your compiler emit warnings if you use -# any Qt feature that has been marked deprecated (the exact warnings -# depend on your compiler). Please consult the documentation of the -# deprecated API in order to know how to port your code away from it. -DEFINES += QT_DEPRECATED_WARNINGS - -# You can also make your code fail to compile if it uses deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - -unix: DEFINES += MPRIS_ENABLE - -INCLUDEPATH += . # without this lupdate shows errors: Qualifying with unknown namespace/class - -SOURCES += \ - about_ui/aboutdialog.cpp \ - audio_device_ui/devicesmenu.cpp \ - busyspinner.cpp \ - config/global.cpp \ - config/local.cpp \ - config/storage.cpp \ - config/value.cpp \ - coverart/embedded.cpp \ - directory_ui/directorycontroller.cpp \ - directory_ui/directorysettings.cpp \ - feedback_ui/feedbackform.cpp \ - ipc/instance.cpp \ - main.cpp \ - mainmenu.cpp \ - mainwindow.cpp \ - directory_ui/directorymodel.cpp \ - playback/controls.cpp \ - playback/dispatch.cpp \ - playback/mediaplayer.cpp \ - playback/playbackcontroller.cpp \ - playback/randomtrail.cpp \ - playback_log_ui/playbacklogdialog.cpp \ - playback_log_ui/playbackloguicontroller.cpp \ - playback_log_ui/playbackloguimodel.cpp \ - coverart/covers.cpp \ - playlist/cueparser.cpp \ - playlist/fileparser.cpp \ - playlist/loader.cpp \ - playlist/sorter.cpp \ - playlist_ui/columnsconfig.cpp \ - playlist_ui/playlistcontroller.cpp \ - playlist_ui/playlistmodel.cpp \ - playlist/playlist.cpp \ - playback/playerstate.cpp \ - playlist_ui/playlistproxyfiltermodel.cpp \ - playlist_ui/playlistcontextmenu.cpp \ - playlist_ui/trackinfodialog.cpp \ - playlists_ui/playlistscontextmenu.cpp \ - directory_ui/directorycontextmenu.cpp \ - directory_ui/directorysortmenu.cpp \ - playlists_ui/playlistscontroller.cpp \ - playlists_ui/playlistsmodel.cpp \ - playlists_ui/playlistsproxyfiltermodel.cpp \ - rnjesus.cpp \ - shortcuts.cpp \ - shortcuts_ui/shortcutsdialog.cpp \ - sleeplock.cpp \ - sort_ui/sortingpresetsdialog.cpp \ - sort_ui/sortmenu.cpp \ - statusbarlabel.cpp \ - sysinfo.cpp \ - track.cpp \ - trayicon.cpp \ - volumecontrol.cpp \ - playback/stream.cpp \ - streammetadata.cpp - -HEADERS += \ - about_ui/aboutdialog.h \ - audio_device_ui/devicesmenu.h \ - busyspinner.h \ - config/global.h \ - config/local.h \ - config/storage.h \ - config/value.h \ - coverart/embedded.h \ - directory_ui/directorycontroller.h \ - directory_ui/directorysettings.h \ - feedback_ui/feedbackform.h \ - ipc/instance.h \ - mainmenu.h \ - mainwindow.h \ - directory_ui/directorymodel.h \ - playback/controls.h \ - playback/dispatch.h \ - playback/mediaplayer.h \ - playback/playbackcontroller.h \ - playback/randomtrail.h \ - playback_log_ui/playbacklogdialog.h \ - playback_log_ui/playbackloguicontroller.h \ - playback_log_ui/playbackloguimodel.h \ - coverart/covers.h \ - playlist/cueparser.h \ - playlist/fileparser.h \ - playlist/loader.h \ - playlist/sorter.h \ - playlist_ui/columnsconfig.h \ - playlist_ui/playlistcontroller.h \ - playlist_ui/playlistmodel.h \ - playlist_ui/playlistcontextmenu.h \ - playlist_ui/trackinfodialog.h \ - playlists_ui/playlistscontextmenu.h \ - directory_ui/directorycontextmenu.h \ - directory_ui/directorysortmenu.h \ - playlist/playlist.h \ - playback/playerstate.h \ - playlist_ui/playlistproxyfiltermodel.h \ - playlists_ui/playlistscontroller.h \ - playlists_ui/playlistsmodel.h \ - playlists_ui/playlistsproxyfiltermodel.h \ - rnjesus.h \ - shortcuts.h \ - shortcuts_ui/shortcutsdialog.h \ - sleeplock.h \ - sort_ui/sortingpresetsdialog.h \ - sort_ui/sortmenu.h \ - statusbarlabel.h \ - sysinfo.h \ - track.h \ - trayicon.h \ - volumecontrol.h \ - playback/stream.h \ - streammetadata.h - -FORMS += \ - about_ui/aboutdialog.ui \ - directory_ui/directorysettings.ui \ - feedback_ui/feedbackform.ui \ - mainwindow.ui \ - playback_log_ui/playbacklogdialog.ui \ - playlist_ui/trackinfodialog.ui \ - shortcuts_ui/shortcutsdialog.ui \ - sort_ui/sortingpresets.ui - -contains(DEFINES, MPRIS_ENABLE) { - DBUS_ADAPTORS += \ - dbus/org.mpris.MediaPlayer2.xml \ - dbus/org.mpris.MediaPlayer2.Player.xml - - HEADERS += \ - dbus/mpris.h - - SOURCES += \ - dbus/mpris.cpp - - QT += dbus -} - -!contains(DEFINES, USE_SYSTEM_TAGLIB) { - DEFINES += TAGLIB_STATIC -} -!contains(DEFINES, USE_SYSTEM_YAMLCPP) { - DEFINES += YAML_CPP_STATIC_DEFINE -} - -# Libraries -INCLUDEPATH += \ - ../libs/qtwaitingspinner \ - ../libs/qhotkey/QHotkey-1.5.0 -!contains(DEFINES, USE_SYSTEM_TAGLIB) { - INCLUDEPATH += \ - ../libs/taglib/taglib-2.0.2/taglib \ - ../libs/taglib/taglib-2.0.2/taglib/toolkit \ - ../libs/taglib/taglib-2.0.2/taglib/mpeg/id3v2 -} -!contains(DEFINES, USE_SYSTEM_YAMLCPP) { - INCLUDEPATH += \ - ../libs/yaml-cpp/yaml-cpp-0.8.0/include -} - -LIBS += \ - -L../libs/qtwaitingspinner -lqtwaitingspinner \ - -L../libs/qhotkey -lqhotkey \ - -ltag \ - -lyaml-cpp -!contains(DEFINES, USE_SYSTEM_TAGLIB) { - LIBS += -L../libs/taglib -} -!contains(DEFINES, USE_SYSTEM_YAMLCPP) { - LIBS += -L../libs/yaml-cpp -} - -include(../libs/qhotkey/qhotkey.pri) -# End of libraries - -RESOURCES += \ - ../resources.qrc - -# make install -target.path = /usr/bin/ -INSTALLS += target - -TRANSLATIONS += \ - resources/translations/ru.ts \ - resources/translations/sr.ts diff --git a/app/dbus/mpris.cpp b/app/dbus/mpris.cpp index 412e6632..05a455ef 100644 --- a/app/dbus/mpris.cpp +++ b/app/dbus/mpris.cpp @@ -1,7 +1,7 @@ #include "mpris.h" -#include "player_adaptor.h" // generated -#include "mediaplayer2_adaptor.h" // generated +#include "playeradaptor.h" // generated +#include "mediaplayer2adaptor.h" // generated #include #include diff --git a/app/dbus/mpris.h b/app/dbus/mpris.h index 06417511..25bf78c1 100644 --- a/app/dbus/mpris.h +++ b/app/dbus/mpris.h @@ -78,7 +78,6 @@ class Mpris : public QObject { public slots: void on_shuffleChanged(bool val); -private slots: void Raise(); void Quit(); void Next(); diff --git a/app/resources/icons/mpz.rc b/app/resources/icons/mpz.rc new file mode 100644 index 00000000..33ec1c08 --- /dev/null +++ b/app/resources/icons/mpz.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "mpz.ico" diff --git a/app/shortcuts.h b/app/shortcuts.h index 407e6a13..abb3acea 100644 --- a/app/shortcuts.h +++ b/app/shortcuts.h @@ -2,7 +2,7 @@ #define SHORTCUTS_H #include "config/global.h" -#include "QHotkey/qhotkey.h" +#include #include #include diff --git a/deb/debian.control b/deb/debian.control index 50e206ec..8e256c18 100644 --- a/deb/debian.control +++ b/deb/debian.control @@ -2,7 +2,7 @@ Source: mpz Section: sound Priority: optional Maintainer: Oleg Antonyan -Build-Depends: debhelper (>= 8.0.0), build-essential, qt5-qmake, qtbase5-dev-tools, qtchooser, qtbase5-dev, qtmultimedia5-dev, libqt5x11extras5-dev +Build-Depends: debhelper (>= 8.0.0), build-essential, cmake, qtbase5-dev-tools, qtbase5-dev, qtmultimedia5-dev, libqt5x11extras5-dev Standards-Version: 3.9.4 Homepage: https://github.com/olegantonyan/mpz diff --git a/deb/debian.rules b/deb/debian.rules index 986f3cbe..762284b9 100644 --- a/deb/debian.rules +++ b/deb/debian.rules @@ -3,11 +3,8 @@ # Be carefull, this is a Makefile, so the indents are tabs and not spaces! # -*- makefile -*- -export DESTROOT=$(CURDIR)/debian/mpz -export QT_SELECT=qt5 - %: dh $@ -override_dh_auto_install: - make install INSTALL_ROOT=$(DESTROOT) +override_dh_auto_configure: + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DUSE_QT5=ON diff --git a/libs/qhotkey/qhotkey.pri b/libs/qhotkey/qhotkey.pri deleted file mode 100644 index 636f3b7a..00000000 --- a/libs/qhotkey/qhotkey.pri +++ /dev/null @@ -1,6 +0,0 @@ -mac: LIBS += -framework Carbon -else:win32: LIBS += -luser32 -else:unix { - lessThan(QT_MAJOR_VERSION, 6): QT += x11extras - LIBS += -lX11 -} diff --git a/libs/qhotkey/qhotkey.pro b/libs/qhotkey/qhotkey.pro deleted file mode 100644 index d4c0b41f..00000000 --- a/libs/qhotkey/qhotkey.pro +++ /dev/null @@ -1,27 +0,0 @@ -TEMPLATE = lib -CONFIG += staticlib -CONFIG += c++17 - -TARGET = qhotkey - -win32: CONFIG -= debug_and_release - -HEADERS += \ - QHotkey-1.5.0/QHotkey/qhotkey.h \ - QHotkey-1.5.0/QHotkey/QHotkey \ - QHotkey-1.5.0/QHotkey/qhotkey_p.h - -SOURCES += \ - QHotkey-1.5.0/QHotkey/qhotkey.cpp - -mac: SOURCES += QHotkey-1.5.0/QHotkey/qhotkey_mac.cpp -else:win32: SOURCES += QHotkey-1.5.0/QHotkey/qhotkey_win.cpp -else:unix: SOURCES += QHotkey-1.5.0/QHotkey/qhotkey_x11.cpp - -INCLUDEPATH += QHotkey-1.5.0/QHotkey - -include(qhotkey.pri) - -DEFINES += QHOTKEY_LIB QHOTKEY_LIB_BUILD - - diff --git a/libs/taglib/taglib-2.0.2/taglib-config.cmake b/libs/taglib/taglib-2.0.2/taglib-config.cmake deleted file mode 100644 index c2539fb0..00000000 --- a/libs/taglib/taglib-2.0.2/taglib-config.cmake +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh - -usage() -{ - echo "usage: $0 [OPTIONS]" -cat << EOH - -options: - [--libs] - [--cflags] - [--version] - [--prefix] -EOH - exit 1 -} - -# Looks useless as it is, but could be replaced with a "pcfiledir" by Buildroot. -prefix= -exec_prefix= - -if test -z "$prefix"; then - includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ -else - includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -fi -if test -z "$exec_prefix"; then - libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -else - libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -fi - -flags="" - -if test $# -eq 0 ; then - usage -fi - -while test $# -gt 0 -do - case $1 in - --libs) - flags="$flags -L$libdir -ltag@TAGLIB_INSTALL_SUFFIX@ @ZLIB_LIBRARIES_FLAGS@" - ;; - --cflags) - flags="$flags -I$includedir -I$includedir/taglib@TAGLIB_INSTALL_SUFFIX@" - ;; - --version) - echo @TAGLIB_LIB_VERSION_STRING@ - ;; - --prefix) - echo ${prefix:-@CMAKE_INSTALL_PREFIX@} - ;; - *) - echo "$0: unknown option $1" - echo - usage - ;; - esac - shift -done - -if test -n "$flags" -then - echo $flags -fi diff --git a/libs/taglib/taglib.pro b/libs/taglib/taglib.pro deleted file mode 100644 index 73c35433..00000000 --- a/libs/taglib/taglib.pro +++ /dev/null @@ -1,294 +0,0 @@ -TEMPLATE = lib -TARGET = tag - -CONFIG += warn_off -CONFIG += staticlib -CONFIG += c++17 - -DEFINES += "NDEBUG=1" -DEFINES += TAGLIB_STATIC -DEFINES += HAVE_GCC_ATOMIC - -win32: CONFIG -= debug_and_release - -SOURCES += \ - taglib-2.0.2/taglib/asf/asfattribute.cpp \ - taglib-2.0.2/taglib/asf/asfproperties.cpp \ - taglib-2.0.2/taglib/asf/asffile.cpp \ - taglib-2.0.2/taglib/asf/asfpicture.cpp \ - taglib-2.0.2/taglib/asf/asftag.cpp \ - taglib-2.0.2/taglib/wavpack/wavpackfile.cpp \ - taglib-2.0.2/taglib/wavpack/wavpackproperties.cpp \ - taglib-2.0.2/taglib/mpc/mpcfile.cpp \ - taglib-2.0.2/taglib/mpc/mpcproperties.cpp \ - taglib-2.0.2/taglib/flac/flacproperties.cpp \ - taglib-2.0.2/taglib/flac/flacpicture.cpp \ - taglib-2.0.2/taglib/flac/flacmetadatablock.cpp \ - taglib-2.0.2/taglib/flac/flacunknownmetadatablock.cpp \ - taglib-2.0.2/taglib/flac/flacfile.cpp \ - taglib-2.0.2/taglib/ogg/opus/opusproperties.cpp \ - taglib-2.0.2/taglib/ogg/opus/opusfile.cpp \ - taglib-2.0.2/taglib/ogg/flac/oggflacfile.cpp \ - taglib-2.0.2/taglib/ogg/oggfile.cpp \ - taglib-2.0.2/taglib/ogg/oggpage.cpp \ - taglib-2.0.2/taglib/ogg/oggpageheader.cpp \ - taglib-2.0.2/taglib/ogg/xiphcomment.cpp \ - taglib-2.0.2/taglib/ogg/vorbis/vorbisfile.cpp \ - taglib-2.0.2/taglib/ogg/vorbis/vorbisproperties.cpp \ - taglib-2.0.2/taglib/ogg/speex/speexfile.cpp \ - taglib-2.0.2/taglib/ogg/speex/speexproperties.cpp \ - taglib-2.0.2/taglib/tag.cpp \ - taglib-2.0.2/taglib/toolkit/tstringlist.cpp \ - taglib-2.0.2/taglib/toolkit/tbytevectorstream.cpp \ - taglib-2.0.2/taglib/toolkit/tvariant.cpp \ - taglib-2.0.2/taglib/toolkit/tversionnumber.cpp \ - taglib-2.0.2/taglib/toolkit/tdebuglistener.cpp \ - taglib-2.0.2/taglib/toolkit/tbytevector.cpp \ - taglib-2.0.2/taglib/toolkit/tzlib.cpp \ - taglib-2.0.2/taglib/toolkit/tiostream.cpp \ - taglib-2.0.2/taglib/toolkit/tfile.cpp \ - taglib-2.0.2/taglib/toolkit/tpicturetype.cpp \ - taglib-2.0.2/taglib/toolkit/tdebug.cpp \ - taglib-2.0.2/taglib/toolkit/tpropertymap.cpp \ - taglib-2.0.2/taglib/toolkit/tbytevectorlist.cpp \ - taglib-2.0.2/taglib/toolkit/tfilestream.cpp \ - taglib-2.0.2/taglib/toolkit/tstring.cpp \ - taglib-2.0.2/taglib/mpeg/mpegheader.cpp \ - taglib-2.0.2/taglib/mpeg/id3v1/id3v1tag.cpp \ - taglib-2.0.2/taglib/mpeg/id3v1/id3v1genres.cpp \ - taglib-2.0.2/taglib/mpeg/mpegproperties.cpp \ - taglib-2.0.2/taglib/mpeg/xingheader.cpp \ - taglib-2.0.2/taglib/mpeg/mpegfile.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/id3v2tag.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/id3v2synchdata.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/privateframe.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/podcastframe.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/textidentificationframe.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/chapterframe.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/commentsframe.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/unknownframe.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/popularimeterframe.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/ownershipframe.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/urllinkframe.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/id3v2header.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/id3v2footer.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/id3v2extendedheader.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/id3v2framefactory.cpp \ - taglib-2.0.2/taglib/mpeg/id3v2/id3v2frame.cpp \ - taglib-2.0.2/taglib/riff/wav/wavproperties.cpp \ - taglib-2.0.2/taglib/riff/wav/infotag.cpp \ - taglib-2.0.2/taglib/riff/wav/wavfile.cpp \ - taglib-2.0.2/taglib/riff/aiff/aifffile.cpp \ - taglib-2.0.2/taglib/riff/aiff/aiffproperties.cpp \ - taglib-2.0.2/taglib/riff/rifffile.cpp \ - taglib-2.0.2/taglib/mp4/mp4file.cpp \ - taglib-2.0.2/taglib/mp4/mp4properties.cpp \ - taglib-2.0.2/taglib/mp4/mp4itemfactory.cpp \ - taglib-2.0.2/taglib/mp4/mp4tag.cpp \ - taglib-2.0.2/taglib/mp4/mp4atom.cpp \ - taglib-2.0.2/taglib/mp4/mp4item.cpp \ - taglib-2.0.2/taglib/mp4/mp4coverart.cpp \ - taglib-2.0.2/taglib/dsf/dsffile.cpp \ - taglib-2.0.2/taglib/dsf/dsfproperties.cpp \ - taglib-2.0.2/taglib/mod/modfile.cpp \ - taglib-2.0.2/taglib/mod/modtag.cpp \ - taglib-2.0.2/taglib/mod/modfilebase.cpp \ - taglib-2.0.2/taglib/mod/modproperties.cpp \ - taglib-2.0.2/taglib/xm/xmproperties.cpp \ - taglib-2.0.2/taglib/xm/xmfile.cpp \ - taglib-2.0.2/taglib/it/itproperties.cpp \ - taglib-2.0.2/taglib/it/itfile.cpp \ - taglib-2.0.2/taglib/ape/apetag.cpp \ - taglib-2.0.2/taglib/ape/apefile.cpp \ - taglib-2.0.2/taglib/ape/apefooter.cpp \ - taglib-2.0.2/taglib/ape/apeitem.cpp \ - taglib-2.0.2/taglib/ape/apeproperties.cpp \ - taglib-2.0.2/taglib/dsdiff/dsdiffdiintag.cpp \ - taglib-2.0.2/taglib/dsdiff/dsdiffproperties.cpp \ - taglib-2.0.2/taglib/dsdiff/dsdifffile.cpp \ - taglib-2.0.2/taglib/fileref.cpp \ - taglib-2.0.2/taglib/tagunion.cpp \ - taglib-2.0.2/taglib/tagutils.cpp \ - taglib-2.0.2/taglib/audioproperties.cpp \ - taglib-2.0.2/taglib/trueaudio/trueaudioproperties.cpp \ - taglib-2.0.2/taglib/trueaudio/trueaudiofile.cpp \ - taglib-2.0.2/taglib/s3m/s3mproperties.cpp \ - taglib-2.0.2/taglib/s3m/s3mfile.cpp \ - taglib-2.0.2/bindings/c/tag_c.cpp - - -HEADERS += \ - taglib-2.0.2/taglib/asf/asffile.h \ - taglib-2.0.2/taglib/asf/asfproperties.h \ - taglib-2.0.2/taglib/asf/asfpicture.h \ - taglib-2.0.2/taglib/asf/asftag.h \ - taglib-2.0.2/taglib/asf/asfutils.h \ - taglib-2.0.2/taglib/asf/asfattribute.h \ - taglib-2.0.2/taglib/wavpack/wavpackproperties.h \ - taglib-2.0.2/taglib/wavpack/wavpackfile.h \ - taglib-2.0.2/taglib/mpc/mpcfile.h \ - taglib-2.0.2/taglib/mpc/mpcproperties.h \ - taglib-2.0.2/taglib/flac/flacunknownmetadatablock.h \ - taglib-2.0.2/taglib/flac/flacmetadatablock.h \ - taglib-2.0.2/taglib/flac/flacfile.h \ - taglib-2.0.2/taglib/flac/flacpicture.h \ - taglib-2.0.2/taglib/flac/flacproperties.h \ - taglib-2.0.2/taglib/ogg/opus/opusproperties.h \ - taglib-2.0.2/taglib/ogg/opus/opusfile.h \ - taglib-2.0.2/taglib/ogg/flac/oggflacfile.h \ - taglib-2.0.2/taglib/ogg/oggpageheader.h \ - taglib-2.0.2/taglib/ogg/oggfile.h \ - taglib-2.0.2/taglib/ogg/oggpage.h \ - taglib-2.0.2/taglib/ogg/vorbis/vorbisproperties.h \ - taglib-2.0.2/taglib/ogg/vorbis/vorbisfile.h \ - taglib-2.0.2/taglib/ogg/speex/speexfile.h \ - taglib-2.0.2/taglib/ogg/speex/speexproperties.h \ - taglib-2.0.2/taglib/ogg/xiphcomment.h \ - taglib-2.0.2/taglib/audioproperties.h \ - taglib-2.0.2/taglib/tagutils.h \ - taglib-2.0.2/taglib/toolkit/tzlib.h \ - taglib-2.0.2/taglib/toolkit/tfilestream.h \ - taglib-2.0.2/taglib/toolkit/tversionnumber.h \ - taglib-2.0.2/taglib/toolkit/tstring.h \ - taglib-2.0.2/taglib/toolkit/tlist.h \ - taglib-2.0.2/taglib/toolkit/tvariant.h \ - taglib-2.0.2/taglib/toolkit/taglib.h \ - taglib-2.0.2/taglib/toolkit/tdebug.h \ - taglib-2.0.2/taglib/toolkit/tfile.h \ - taglib-2.0.2/taglib/toolkit/tiostream.h \ - taglib-2.0.2/taglib/toolkit/tstringlist.h \ - taglib-2.0.2/taglib/toolkit/tutils.h \ - taglib-2.0.2/taglib/toolkit/tdebuglistener.h \ - taglib-2.0.2/taglib/toolkit/tbytevectorstream.h \ - taglib-2.0.2/taglib/toolkit/tbytevectorlist.h \ - taglib-2.0.2/taglib/toolkit/tpropertymap.h \ - taglib-2.0.2/taglib/toolkit/tpicturetype.h \ - taglib-2.0.2/taglib/toolkit/tbytevector.h \ - taglib-2.0.2/taglib/toolkit/tmap.h \ - taglib-2.0.2/taglib/mpeg/mpegproperties.h \ - taglib-2.0.2/taglib/mpeg/id3v1/id3v1tag.h \ - taglib-2.0.2/taglib/mpeg/id3v1/id3v1genres.h \ - taglib-2.0.2/taglib/mpeg/xingheader.h \ - taglib-2.0.2/taglib/mpeg/mpegheader.h \ - taglib-2.0.2/taglib/mpeg/mpegfile.h \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/popularimeterframe.h \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/relativevolumeframe.h \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/tableofcontentsframe.h \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/attachedpictureframe.h \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/ownershipframe.h \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/commentsframe.h \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/unknownframe.h \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/textidentificationframe.h \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/privateframe.h \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/chapterframe.h \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/urllinkframe.h \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/podcastframe.h \ - taglib-2.0.2/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h \ - taglib-2.0.2/taglib/mpeg/id3v2/id3v2.h \ - taglib-2.0.2/taglib/mpeg/id3v2/id3v2tag.h \ - taglib-2.0.2/taglib/mpeg/id3v2/id3v2header.h \ - taglib-2.0.2/taglib/mpeg/id3v2/id3v2extendedheader.h \ - taglib-2.0.2/taglib/mpeg/id3v2/id3v2footer.h \ - taglib-2.0.2/taglib/mpeg/id3v2/id3v2frame.h \ - taglib-2.0.2/taglib/mpeg/id3v2/id3v2synchdata.h \ - taglib-2.0.2/taglib/mpeg/id3v2/id3v2framefactory.h \ - taglib-2.0.2/taglib/mpeg/mpegutils.h \ - taglib-2.0.2/taglib/tagunion.h \ - taglib-2.0.2/taglib/fileref.h \ - taglib-2.0.2/taglib/riff/wav/wavfile.h \ - taglib-2.0.2/taglib/riff/wav/wavproperties.h \ - taglib-2.0.2/taglib/riff/wav/infotag.h \ - taglib-2.0.2/taglib/riff/aiff/aiffproperties.h \ - taglib-2.0.2/taglib/riff/aiff/aifffile.h \ - taglib-2.0.2/taglib/riff/riffutils.h \ - taglib-2.0.2/taglib/riff/rifffile.h \ - taglib-2.0.2/taglib/mp4/mp4item.h \ - taglib-2.0.2/taglib/mp4/mp4coverart.h \ - taglib-2.0.2/taglib/mp4/mp4tag.h \ - taglib-2.0.2/taglib/mp4/mp4file.h \ - taglib-2.0.2/taglib/mp4/mp4itemfactory.h \ - taglib-2.0.2/taglib/mp4/mp4properties.h \ - taglib-2.0.2/taglib/mp4/mp4atom.h \ - taglib-2.0.2/taglib/dsf/dsffile.h \ - taglib-2.0.2/taglib/dsf/dsfproperties.h \ - taglib-2.0.2/taglib/mod/modfileprivate.h \ - taglib-2.0.2/taglib/mod/modfilebase.h \ - taglib-2.0.2/taglib/mod/modtag.h \ - taglib-2.0.2/taglib/mod/modproperties.h \ - taglib-2.0.2/taglib/mod/modfile.h \ - taglib-2.0.2/taglib/xm/xmfile.h \ - taglib-2.0.2/taglib/xm/xmproperties.h \ - taglib-2.0.2/taglib/it/itproperties.h \ - taglib-2.0.2/taglib/it/itfile.h \ - taglib-2.0.2/taglib/ape/apeproperties.h \ - taglib-2.0.2/taglib/ape/apefile.h \ - taglib-2.0.2/taglib/ape/apeitem.h \ - taglib-2.0.2/taglib/ape/apefooter.h \ - taglib-2.0.2/taglib/ape/apetag.h \ - taglib-2.0.2/taglib/dsdiff/dsdiffproperties.h \ - taglib-2.0.2/taglib/dsdiff/dsdifffile.h \ - taglib-2.0.2/taglib/dsdiff/dsdiffdiintag.h \ - taglib-2.0.2/taglib/tag.h \ - taglib-2.0.2/taglib/taglib_export.h \ - taglib-2.0.2/taglib/trueaudio/trueaudioproperties.h \ - taglib-2.0.2/taglib/trueaudio/trueaudiofile.h \ - taglib-2.0.2/taglib/s3m/s3mfile.h \ - taglib-2.0.2/taglib/s3m/s3mproperties.h \ - taglib-2.0.2/bindings/c/tag_c.h \ - utfcpp-master/source/utf8/checked.h \ - utfcpp-master/source/utf8/core.h \ - utfcpp-master/source/utf8/cpp20.h \ - utfcpp-master/source/utf8/unchecked.h \ - utfcpp-master/source/utf8/cpp17.h \ - utfcpp-master/source/utf8/cpp11.h \ - utfcpp-master/source/utf8.h - -INCLUDEPATH += \ - taglib-2.0.2/bindings \ - taglib-2.0.2/bindings/c \ - taglib-2.0.2/3rdparty \ - taglib-2.0.2/3rdparty/utfcpp \ - taglib-2.0.2/taglib \ - taglib-2.0.2/taglib/asf \ - taglib-2.0.2/taglib/wavpack \ - taglib-2.0.2/taglib/mpc \ - taglib-2.0.2/taglib/flac \ - taglib-2.0.2/taglib/ogg \ - taglib-2.0.2/taglib/ogg/opus \ - taglib-2.0.2/taglib/ogg/flac \ - taglib-2.0.2/taglib/ogg/vorbis \ - taglib-2.0.2/taglib/ogg/speex \ - taglib-2.0.2/taglib/toolkit \ - taglib-2.0.2/taglib/mpeg \ - taglib-2.0.2/taglib/mpeg/id3v1 \ - taglib-2.0.2/taglib/mpeg/id3v2 \ - taglib-2.0.2/taglib/mpeg/id3v2/frames \ - taglib-2.0.2/taglib/riff \ - taglib-2.0.2/taglib/riff/wav \ - taglib-2.0.2/taglib/riff/aiff \ - taglib-2.0.2/taglib/mp4 \ - taglib-2.0.2/taglib/dsf \ - taglib-2.0.2/taglib/mod \ - taglib-2.0.2/taglib/xm \ - taglib-2.0.2/taglib/it \ - taglib-2.0.2/taglib/ape \ - taglib-2.0.2/taglib/dsdiff \ - taglib-2.0.2/taglib/trueaudio \ - taglib-2.0.2/taglib/s3m \ - utfcpp-master/source \ - utfcpp-master - - - diff --git a/libs/yaml-cpp/yaml-cpp.pro b/libs/yaml-cpp/yaml-cpp.pro deleted file mode 100644 index 89d07f3e..00000000 --- a/libs/yaml-cpp/yaml-cpp.pro +++ /dev/null @@ -1,112 +0,0 @@ -TEMPLATE = lib -TARGET = yaml-cpp - -CONFIG += warn_off -CONFIG += staticlib -CONFIG += c++17 - -DEFINES += YAML_CPP_STATIC_DEFINE - -win32: CONFIG -= debug_and_release - -SOURCES += \ - yaml-cpp-0.8.0/src/convert.cpp \ - yaml-cpp-0.8.0/src/null.cpp \ - yaml-cpp-0.8.0/src/directives.cpp \ - yaml-cpp-0.8.0/src/exceptions.cpp \ - yaml-cpp-0.8.0/src/singledocparser.cpp \ - yaml-cpp-0.8.0/src/contrib/graphbuilder.cpp \ - yaml-cpp-0.8.0/src/contrib/graphbuilderadapter.cpp \ - yaml-cpp-0.8.0/src/nodeevents.cpp \ - yaml-cpp-0.8.0/src/emitter.cpp \ - yaml-cpp-0.8.0/src/depthguard.cpp \ - yaml-cpp-0.8.0/src/ostream_wrapper.cpp \ - yaml-cpp-0.8.0/src/simplekey.cpp \ - yaml-cpp-0.8.0/src/scantag.cpp \ - yaml-cpp-0.8.0/src/scanscalar.cpp \ - yaml-cpp-0.8.0/src/exp.cpp \ - yaml-cpp-0.8.0/src/emit.cpp \ - yaml-cpp-0.8.0/src/scanner.cpp \ - yaml-cpp-0.8.0/src/emitterstate.cpp \ - yaml-cpp-0.8.0/src/emitterutils.cpp \ - yaml-cpp-0.8.0/src/parser.cpp \ - yaml-cpp-0.8.0/src/memory.cpp \ - yaml-cpp-0.8.0/src/emitfromevents.cpp \ - yaml-cpp-0.8.0/src/nodebuilder.cpp \ - yaml-cpp-0.8.0/src/regex_yaml.cpp \ - yaml-cpp-0.8.0/src/node.cpp \ - yaml-cpp-0.8.0/src/node_data.cpp \ - yaml-cpp-0.8.0/src/binary.cpp \ - yaml-cpp-0.8.0/src/scantoken.cpp \ - yaml-cpp-0.8.0/src/parse.cpp \ - yaml-cpp-0.8.0/src/tag.cpp \ - yaml-cpp-0.8.0/src/stream.cpp \ - - -HEADERS += \ - yaml-cpp-0.8.0/src/stringsource.h \ - yaml-cpp-0.8.0/src/tag.h \ - yaml-cpp-0.8.0/src/scantag.h \ - yaml-cpp-0.8.0/src/singledocparser.h \ - yaml-cpp-0.8.0/src/streamcharsource.h \ - yaml-cpp-0.8.0/src/contrib/graphbuilderadapter.h \ - yaml-cpp-0.8.0/src/indentation.h \ - yaml-cpp-0.8.0/src/nodebuilder.h \ - yaml-cpp-0.8.0/src/setting.h \ - yaml-cpp-0.8.0/src/ptr_vector.h \ - yaml-cpp-0.8.0/src/token.h \ - yaml-cpp-0.8.0/src/regeximpl.h \ - yaml-cpp-0.8.0/src/emitterstate.h \ - yaml-cpp-0.8.0/src/regex_yaml.h \ - yaml-cpp-0.8.0/src/collectionstack.h \ - yaml-cpp-0.8.0/src/stream.h \ - yaml-cpp-0.8.0/src/exp.h \ - yaml-cpp-0.8.0/src/emitterutils.h \ - yaml-cpp-0.8.0/src/scanner.h \ - yaml-cpp-0.8.0/src/scanscalar.h \ - yaml-cpp-0.8.0/src/nodeevents.h \ - yaml-cpp-0.8.0/src/directives.h \ - yaml-cpp-0.8.0/include/yaml-cpp/ostream_wrapper.h \ - yaml-cpp-0.8.0/include/yaml-cpp/null.h \ - yaml-cpp-0.8.0/include/yaml-cpp/noexcept.h \ - yaml-cpp-0.8.0/include/yaml-cpp/contrib/anchordict.h \ - yaml-cpp-0.8.0/include/yaml-cpp/contrib/graphbuilder.h \ - yaml-cpp-0.8.0/include/yaml-cpp/emittermanip.h \ - yaml-cpp-0.8.0/include/yaml-cpp/emitterstyle.h \ - yaml-cpp-0.8.0/include/yaml-cpp/emitterdef.h \ - yaml-cpp-0.8.0/include/yaml-cpp/depthguard.h \ - yaml-cpp-0.8.0/include/yaml-cpp/parser.h \ - yaml-cpp-0.8.0/include/yaml-cpp/emitter.h \ - yaml-cpp-0.8.0/include/yaml-cpp/binary.h \ - yaml-cpp-0.8.0/include/yaml-cpp/anchor.h \ - yaml-cpp-0.8.0/include/yaml-cpp/eventhandler.h \ - yaml-cpp-0.8.0/include/yaml-cpp/exceptions.h \ - yaml-cpp-0.8.0/include/yaml-cpp/emitfromevents.h \ - yaml-cpp-0.8.0/include/yaml-cpp/stlemitter.h \ - yaml-cpp-0.8.0/include/yaml-cpp/node/parse.h \ - yaml-cpp-0.8.0/include/yaml-cpp/node/detail/node_iterator.h \ - yaml-cpp-0.8.0/include/yaml-cpp/node/detail/node.h \ - yaml-cpp-0.8.0/include/yaml-cpp/node/detail/node_ref.h \ - yaml-cpp-0.8.0/include/yaml-cpp/node/detail/iterator.h \ - yaml-cpp-0.8.0/include/yaml-cpp/node/detail/impl.h \ - yaml-cpp-0.8.0/include/yaml-cpp/node/detail/node_data.h \ - yaml-cpp-0.8.0/include/yaml-cpp/node/detail/iterator_fwd.h \ - yaml-cpp-0.8.0/include/yaml-cpp/node/detail/memory.h \ - yaml-cpp-0.8.0/include/yaml-cpp/node/emit.h \ - yaml-cpp-0.8.0/include/yaml-cpp/node/node.h \ - yaml-cpp-0.8.0/include/yaml-cpp/node/type.h \ - yaml-cpp-0.8.0/include/yaml-cpp/node/iterator.h \ - yaml-cpp-0.8.0/include/yaml-cpp/node/impl.h \ - yaml-cpp-0.8.0/include/yaml-cpp/node/ptr.h \ - yaml-cpp-0.8.0/include/yaml-cpp/node/convert.h \ - yaml-cpp-0.8.0/include/yaml-cpp/dll.h \ - yaml-cpp-0.8.0/include/yaml-cpp/yaml.h \ - yaml-cpp-0.8.0/include/yaml-cpp/traits.h \ - yaml-cpp-0.8.0/include/yaml-cpp/mark.h \ - - -INCLUDEPATH += \ - yaml-cpp-0.8.0/include \ - yaml-cpp-0.8.0/src \ - yaml-cpp-0.8.0/src/contrib \ - diff --git a/mpz.pro b/mpz.pro deleted file mode 100644 index 8da8dbb1..00000000 --- a/mpz.pro +++ /dev/null @@ -1,44 +0,0 @@ -TEMPLATE = subdirs -CONFIG += ordered - -SUBDIRS = \ - libs/qtwaitingspinner \ - libs/qhotkey -!contains(DEFINES, USE_SYSTEM_TAGLIB) { - SUBDIRS += libs/taglib -} -!contains(DEFINES, USE_SYSTEM_YAMLCPP) { - SUBDIRS += libs/yaml-cpp -} -SUBDIRS += app - -# make install -desktop.path = /usr/share/applications/ -desktop.files += mpz.desktop - -icon512.path = /usr/share/icons/hicolor/512x512/apps/ -icon512.files += app/resources/icons/512x512/mpz.png -icon256.path = /usr/share/icons/hicolor/256x256/apps/ -icon256.files += app/resources/icons/256x256/mpz.png -icon192.path = /usr/share/icons/hicolor/192x192/apps/ -icon192.files += app/resources/icons/192x192/mpz.png -icon128.path = /usr/share/icons/hicolor/128x128/apps/ -icon128.files += app/resources/icons/128x128/mpz.png -icon96.path = /usr/share/icons/hicolor/96x96/apps/ -icon96.files += app/resources/icons/96x96/mpz.png -icon72.path = /usr/share/icons/hicolor/72x72/apps/ -icon72.files += app/resources/icons/72x72/mpz.png -icon64.path = /usr/share/icons/hicolor/64x64/apps/ -icon64.files += app/resources/icons/64x64/mpz.png -icon48.path = /usr/share/icons/hicolor/48x48/apps/ -icon48.files += app/resources/icons/48x48/mpz.png -icon32.path = /usr/share/icons/hicolor/32x32/apps/ -icon32.files += app/resources/icons/32x32/mpz.png -icon24.path = /usr/share/icons/hicolor/24x24/apps/ -icon24.files += app/resources/icons/24x24/mpz.png -icon22.path = /usr/share/icons/hicolor/22x22/apps/ -icon22.files += app/resources/icons/22x22/mpz.png -icon16.path = /usr/share/icons/hicolor/16x16/apps/ -icon16.files += app/resources/icons/16x16/mpz.png - -INSTALLS += desktop icon512 icon256 icon192 icon128 icon96 icon72 icon64 icon48 icon32 icon24 icon22 icon16 diff --git a/playground.cpp b/playground.cpp new file mode 100644 index 00000000..0dc53644 --- /dev/null +++ b/playground.cpp @@ -0,0 +1,52 @@ +#include + +#include "taglib/fileref.h" +#include "taglib/tag.h" +#ifdef USE_SYSTEM_TAGLIB + #include "taglib/mp4file.h" + #include "taglib/id3v2frame.h" + #include "taglib/attachedpictureframe.h" + #include "taglib/id3v2tag.h" + #include "taglib/mpegfile.h" + #include "taglib/flacfile.h" + #include "taglib/flacpicture.h" +#else + #include "mp4/mp4file.h" + #include "mpeg/id3v2/id3v2frame.h" + #include "mpeg/id3v2/frames/attachedpictureframe.h" + #include "mpeg/id3v2/id3v2tag.h" + #include "mpeg/mpegfile.h" + #include "flac/flacfile.h" + #include "flac/flacpicture.h" +#endif + +#include + +#include "qhotkey.h" + +#include "waitingspinnerwidget.h" + +#include + +int main(int argc, char* argv[]) { + std::cout << "Hello" << std::endl; + + QApplication app(argc, argv); + + TagLib::FileRef f("/run/media/oleg/c3996ce0-a379-4403-9d64-7d4c0536463f/music/Asgaard/2001 - Ex Oriente Lux/10. In Articulo Mortis.mp3"); + if(!f.isNull()) { + if (f.tag()) { + TagLib::Tag *tag = f.tag(); + auto artist = tag->artist().toCString(true); + std::cout << artist << std::endl; + } + } + + YAML::Emitter emitter; + + QHotkey a; + + WaitingSpinnerWidget b; + + return 0; +} diff --git a/rpm/build_rpm_local.sh b/rpm/build_rpm_local.sh index bfd0c804..f0a43adf 100755 --- a/rpm/build_rpm_local.sh +++ b/rpm/build_rpm_local.sh @@ -1,7 +1,7 @@ #!/bin/bash SRC_DIR=$(cd `dirname $0` && cd .. && pwd) -VERSION=$(grep -oP '(?<=").+(?=\\\\\\\")' version.pri) +VERSION=$(gawk 'match($0, /project\(mpz VERSION (.+) LANGUAGES/, m) { print m[1]; }' < CMakeLists.txt | tr -d '\n') TMP_DIR=$(mktemp -d -t mpz-build-$(date +%Y-%m-%d-%H-%M-%S)-XXXXX) TMP_SRC_DIR=mpz-$VERSION TMP_SRC_FULL_DIR=$TMP_DIR/mpz-$VERSION @@ -13,16 +13,8 @@ echo -e "tmp dir:\t$TMP_DIR" echo -e "tmp source dir:\t$TMP_SRC_DIR" echo -e "tmp source full dir:\t$TMP_SRC_FULL_DIR" -mkdir -p $TMP_SRC_FULL_DIR/app -cp -ar app/* $TMP_SRC_FULL_DIR/app -mkdir -p $TMP_SRC_FULL_DIR/libs -cp -ar libs/* $TMP_SRC_FULL_DIR/libs -cp -ar mpz.pro $TMP_SRC_FULL_DIR -cp -ar mpz.desktop $TMP_SRC_FULL_DIR -cp -ar license.txt $TMP_SRC_FULL_DIR -cp -ar version.pri $TMP_SRC_FULL_DIR -cp -ar resources.qrc $TMP_SRC_FULL_DIR -cp -ar CHANGELOG.md $TMP_SRC_FULL_DIR +mkdir -p $TMP_SRC_FULL_DIR/ +cp -ar ./* $TMP_SRC_FULL_DIR/ ls -latrh $TMP_SRC_FULL_DIR tree $TMP_SRC_FULL_DIR @@ -37,7 +29,7 @@ cd $SRC_DIR cp $SPECFILE ~/rpmbuild/SPECS tree ~/rpmbuild/ -rpmbuild --with qt6 -bs $SPECFILE +# rpmbuild --with qt6 -bs $SPECFILE rpmbuild --with qt6 -bb $SPECFILE diff --git a/rpm/mpz.spec b/rpm/mpz.spec index 9150e7db..f023b2bd 100644 --- a/rpm/mpz.spec +++ b/rpm/mpz.spec @@ -9,9 +9,9 @@ Source0: %{name}-%{version}.tar.gz %bcond_with qt6 %if %{with qt6} -BuildRequires: gcc make qt6-base-common-devel qt6-multimedia-devel qt6-widgets-devel qt6-concurrent-devel +BuildRequires: gcc make cmake qt6-base-common-devel qt6-multimedia-devel qt6-widgets-devel qt6-concurrent-devel %else -BuildRequires: gcc make libqt5-qtbase-devel libqt5-qtmultimedia-devel libqt5-qtx11extras-devel +BuildRequires: gcc make cmake libqt5-qtbase-devel libqt5-qtmultimedia-devel libqt5-qtx11extras-devel %endif @@ -29,16 +29,16 @@ Similar to "album list" in Foobar2000. mkdir build cd build %if %{with qt6} -qmake6 CONFIG+=release CONFIG+=force_debug_info .. +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr .. %else -qmake-qt5 CONFIG+=release CONFIG+=force_debug_info .. +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr -DUSE_QT5=ON .. %endif make %{?_smp_mflags} %install cd build -make install INSTALL_ROOT=%{buildroot} +make install %files diff --git a/version.pri b/version.pri deleted file mode 100644 index 55ba7c00..00000000 --- a/version.pri +++ /dev/null @@ -1 +0,0 @@ -DEFINES += VERSION=\\\"1.1.0\\\" diff --git a/win/dynamic_win32_qt5_host.sh b/win/dynamic_win32_qt5_host.sh index 040ae5e1..4402f4d0 100755 --- a/win/dynamic_win32_qt5_host.sh +++ b/win/dynamic_win32_qt5_host.sh @@ -1,9 +1,24 @@ #!/bin/bash -export PATH=$PATH:/e/Qt/Tools/mingw810_32/bin/:/e/Qt/5.15.2/mingw81_32/bin/ +QT_VERSION=5.15.2 + +QT_INSTALL_PATH=/e/Qt + +QTDIR=$QT_INSTALL_PATH/$QT_VERSION/mingw81_32/ +TOOLCHAIN_PATH=$QT_INSTALL_PATH/Tools/mingw810_32/bin +CMAKE_PATH=$QT_INSTALL_PATH/Tools/CMake_64/bin +NINJA_PATH=$QT_INSTALL_PATH/Tools/Ninja + +export PATH=$PATH:$TOOLCHAIN_PATH:$QTDIR/bin/:$CMAKE_PATH:$NINJA_PATH +export QTDIR + +echo -e "Qt path:\t$QTDIR" +echo -e "Toolchain:\t$TOOLCHAIN_PATH" +echo -e "CMake:\t$CMAKE_PATH" +echo -e "Ninja:\t$NINJA_PATH" SRC_DIR=$(cd `dirname $0` && cd .. && pwd) -VERSION=$(grep -oP '(?<=").+(?=\\\\\\\")' $SRC_DIR/version.pri) +VERSION=$(gawk 'match($0, /project\(mpz VERSION (.+) LANGUAGES/, m) { print m[1]; }' < CMakeLists.txt | tr -d '\n') TMP_DIR=$(mktemp -d -t mpz-build-win32-$(date +%Y-%m-%d-%H-%M-%S)-XXXXX) cd $TMP_DIR @@ -13,9 +28,9 @@ echo -e "version:\t$VERSION" echo -e "source dir:\t$SRC_DIR" echo -e "build dir:\t$TMP_DIR" -qmake.exe CONFIG+=release $SRC_DIR && mingw32-make.exe -j6 -windeployqt.exe ./app/mpz.exe --dir $ARTIFACT_NAME -cp ./app/mpz.exe $ARTIFACT_NAME +cmake -DCMAKE_BUILD_TYPE=Release -GNinja -DUSE_QT5=ON $SRC_DIR && ninja +windeployqt.exe ./mpz.exe --dir $ARTIFACT_NAME +cp ./mpz.exe $ARTIFACT_NAME rm -rf $HOME/Desktop/$ARTIFACT_NAME cp -R $ARTIFACT_NAME $HOME/Desktop/ diff --git a/win/dynamic_win64_qt5_host.sh b/win/dynamic_win64_qt5_host.sh index 9e5e70d7..24e39b04 100755 --- a/win/dynamic_win64_qt5_host.sh +++ b/win/dynamic_win64_qt5_host.sh @@ -1,9 +1,24 @@ #!/bin/bash -export PATH=$PATH:/e/Qt/Tools/mingw810_64/bin/:/e/Qt/5.15.2/mingw81_64/bin/ +QT_VERSION=5.15.2 + +QT_INSTALL_PATH=/e/Qt + +QTDIR=$QT_INSTALL_PATH/$QT_VERSION/mingw81_64/ +TOOLCHAIN_PATH=$QT_INSTALL_PATH/Tools/mingw810_64/bin +CMAKE_PATH=$QT_INSTALL_PATH/Tools/CMake_64/bin +NINJA_PATH=$QT_INSTALL_PATH/Tools/Ninja + +export PATH=$PATH:$TOOLCHAIN_PATH:$QTDIR/bin/:$CMAKE_PATH:$NINJA_PATH +export QTDIR + +echo -e "Qt path:\t$QTDIR" +echo -e "Toolchain:\t$TOOLCHAIN_PATH" +echo -e "CMake:\t$CMAKE_PATH" +echo -e "Ninja:\t$NINJA_PATH" SRC_DIR=$(cd `dirname $0` && cd .. && pwd) -VERSION=$(grep -oP '(?<=").+(?=\\\\\\\")' $SRC_DIR/version.pri) +VERSION=$(gawk 'match($0, /project\(mpz VERSION (.+) LANGUAGES/, m) { print m[1]; }' < CMakeLists.txt | tr -d '\n') TMP_DIR=$(mktemp -d -t mpz-build-win64-$(date +%Y-%m-%d-%H-%M-%S)-XXXXX) cd $TMP_DIR @@ -13,9 +28,9 @@ echo -e "version:\t$VERSION" echo -e "source dir:\t$SRC_DIR" echo -e "build dir:\t$TMP_DIR" -qmake.exe CONFIG+=release $SRC_DIR && mingw32-make.exe -j6 -windeployqt.exe ./app/mpz.exe --dir $ARTIFACT_NAME -cp ./app/mpz.exe $ARTIFACT_NAME +cmake -DCMAKE_BUILD_TYPE=Release -GNinja -DUSE_QT5=ON $SRC_DIR && ninja +windeployqt.exe ./mpz.exe --dir $ARTIFACT_NAME +cp ./mpz.exe $ARTIFACT_NAME rm -rf $HOME/Desktop/$ARTIFACT_NAME cp -R $ARTIFACT_NAME $HOME/Desktop/ diff --git a/win/dynamic_win64_qt6_host.sh b/win/dynamic_win64_qt6_host.sh index 39aa8d34..a8051e75 100755 --- a/win/dynamic_win64_qt6_host.sh +++ b/win/dynamic_win64_qt6_host.sh @@ -3,7 +3,7 @@ source `dirname $0`/env_qt6_win64.sh SRC_DIR=$(cd `dirname $0` && cd .. && pwd) -VERSION=$(grep -oP '(?<=").+(?=\\\\\\\")' $SRC_DIR/version.pri) +VERSION=$(gawk 'match($0, /project\(mpz VERSION (.+) LANGUAGES/, m) { print m[1]; }' < CMakeLists.txt | tr -d '\n') TMP_DIR=$(mktemp -d -t mpz-build-win64-qt6-$(date +%Y-%m-%d-%H-%M-%S)-XXXXX) cd $TMP_DIR @@ -13,10 +13,10 @@ echo -e "version:\t$VERSION" echo -e "source dir:\t$SRC_DIR" echo -e "build dir:\t$TMP_DIR" -qmake.exe CONFIG+=release $SRC_DIR && mingw32-make.exe -j6 -windeployqt6.exe ./app/mpz.exe --dir $ARTIFACT_NAME --compiler-runtime --release -cp ./app/mpz.exe $ARTIFACT_NAME -cp -R $QT_PATH/plugins/multimedia $ARTIFACT_NAME +cmake -DCMAKE_BUILD_TYPE=Release -GNinja $SRC_DIR && ninja +windeployqt6.exe ./mpz.exe --dir $ARTIFACT_NAME --compiler-runtime --release +cp ./mpz.exe $ARTIFACT_NAME +cp -R $QTDIR/plugins/multimedia $ARTIFACT_NAME rm -rf $HOME/Desktop/$ARTIFACT_NAME cp -R $ARTIFACT_NAME $HOME/Desktop/ diff --git a/win/env_qt6_win64.sh b/win/env_qt6_win64.sh index 5b895dae..9098a3e3 100755 --- a/win/env_qt6_win64.sh +++ b/win/env_qt6_win64.sh @@ -5,12 +5,17 @@ INSTALLER_FRAMEWORK_VERSION=4.8 QT_INSTALL_PATH=/e/Qt -QT_PATH=$QT_INSTALL_PATH/$QT_VERSION/mingw_64/ +QTDIR=$QT_INSTALL_PATH/$QT_VERSION/mingw_64/ TOOLCHAIN_PATH=$QT_INSTALL_PATH/Tools/mingw1310_64/bin INSTALLER_FRAMEWORK_PATH=$QT_INSTALL_PATH/Tools/QtInstallerFramework/$INSTALLER_FRAMEWORK_VERSION/bin +CMAKE_PATH=$QT_INSTALL_PATH/Tools/CMake_64/bin +NINJA_PATH=$QT_INSTALL_PATH/Tools/Ninja -export PATH=$PATH:$TOOLCHAIN_PATH:$QT_PATH/bin/:$INSTALLER_FRAMEWORK_PATH +export PATH=$PATH:$TOOLCHAIN_PATH:$QTDIR/bin/:$INSTALLER_FRAMEWORK_PATH:$CMAKE_PATH:$NINJA_PATH +export QTDIR -echo -e "Qt path:\t$QT_PATH" +echo -e "Qt path:\t$QTDIR" echo -e "Toolchain:\t$TOOLCHAIN_PATH" +echo -e "CMake:\t$CMAKE_PATH" +echo -e "Ninja:\t$NINJA_PATH" echo -e "Installer:\t$INSTALLER_FRAMEWORK_PATH" diff --git a/win/installer_win64_qt6_host.sh b/win/installer_win64_qt6_host.sh index 5e20f913..3077b24a 100755 --- a/win/installer_win64_qt6_host.sh +++ b/win/installer_win64_qt6_host.sh @@ -3,7 +3,7 @@ source `dirname $0`/env_qt6_win64.sh SRC_DIR=$(cd `dirname $0` && cd .. && pwd) -VERSION=$(grep -oP '(?<=").+(?=\\\\\\\")' $SRC_DIR/version.pri) +VERSION=$(gawk 'match($0, /project\(mpz VERSION (.+) LANGUAGES/, m) { print m[1]; }' < CMakeLists.txt | tr -d '\n') TMP_DIR=$(mktemp -d -t mpz-build-win64-qt6-$(date +%Y-%m-%d-%H-%M-%S)-XXXXX) cd $TMP_DIR @@ -17,10 +17,10 @@ echo -e "version:\t$VERSION" echo -e "source dir:\t$SRC_DIR" echo -e "build dir:\t$TMP_DIR" -qmake.exe CONFIG+=release $SRC_DIR && mingw32-make.exe -j6 -windeployqt6.exe ./app/mpz.exe --dir $ARTIFACT_PATH --compiler-runtime --release -cp ./app/mpz.exe $ARTIFACT_PATH -cp -R $QT_PATH/plugins/multimedia $ARTIFACT_PATH +cmake -DCMAKE_BUILD_TYPE=Release -GNinja $SRC_DIR && ninja +windeployqt6.exe ./mpz.exe --dir $ARTIFACT_PATH --compiler-runtime --release +cp ./mpz.exe $ARTIFACT_PATH +cp -R $QTDIR/plugins/multimedia $ARTIFACT_PATH cd installer cp $SRC_DIR/license.txt packages/mpz/meta/