From 14af861d24352d555eb327fe2f338283a112bab9 Mon Sep 17 00:00:00 2001
From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
Date: Wed, 7 Jun 2017 12:49:44 +0900
Subject: [PATCH] Isolate 3rdparty library for easier maintenance.

---
 {taglib/toolkit/utf8 => 3rdparty/utf8-cpp}/checked.h | 0
 {taglib/toolkit/utf8 => 3rdparty/utf8-cpp}/core.h    | 0
 taglib/CMakeLists.txt                                | 1 +
 taglib/toolkit/tstring.cpp                           | 3 ++-
 4 files changed, 3 insertions(+), 1 deletion(-)
 rename {taglib/toolkit/utf8 => 3rdparty/utf8-cpp}/checked.h (100%)
 rename {taglib/toolkit/utf8 => 3rdparty/utf8-cpp}/core.h (100%)

diff --git a/taglib/toolkit/utf8/checked.h b/3rdparty/utf8-cpp/checked.h
similarity index 100%
rename from taglib/toolkit/utf8/checked.h
rename to 3rdparty/utf8-cpp/checked.h
diff --git a/taglib/toolkit/utf8/core.h b/3rdparty/utf8-cpp/core.h
similarity index 100%
rename from taglib/toolkit/utf8/core.h
rename to 3rdparty/utf8-cpp/core.h
diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt
index a596ca5b..25041d25 100644
--- a/taglib/CMakeLists.txt
+++ b/taglib/CMakeLists.txt
@@ -24,6 +24,7 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/s3m
   ${CMAKE_CURRENT_SOURCE_DIR}/it
   ${CMAKE_CURRENT_SOURCE_DIR}/xm
+  ${CMAKE_SOURCE_DIR}/3rdparty
 )
 
 if(ZLIB_FOUND)
diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
index b26e02fa..c60a3e2e 100644
--- a/taglib/toolkit/tstring.cpp
+++ b/taglib/toolkit/tstring.cpp
@@ -26,11 +26,12 @@
 #include <cerrno>
 #include <climits>
 
+#include <utf8-cpp/checked.h>
+
 #include <tdebug.h>
 #include <tstringlist.h>
 #include <trefcounter.h>
 #include <tutils.h>
-#include <utf8/checked.h>
 
 #include "tstring.h"