Isolate 3rdparty library for easier maintenance.

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 a596ca5b6fcbe1faa378f47565e38ed10a18fa05..25041d251d6aaaca9b5962ebc7cc0a4953bed8df 100644 (file)
--- 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 b26e02fa41b077a3babc0a7d1a6be4b8f18c2bd7..c60a3e2ed2b80d17e4e76f8134923a9e99d76ab8 100644 (file)
--- 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"