From 90ec6f0dc701cba0533c66abdcb904e29f02a66f Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Thu, 23 Jul 2020 01:00:35 +0200 Subject: [PATCH] Drop unused CheckTagLibFileName.cmake and COMPLEX_TAGLIB_FILENAME Signed-off-by: Andreas Sturmlechner --- CMakeLists.txt | 2 -- CMakeModules/CheckTagLibFileName.cmake | 15 --------------- src/tomahawk/Config.h.in | 1 - 3 files changed, 18 deletions(-) delete mode 100644 CMakeModules/CheckTagLibFileName.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index afd88b0c7..b036007f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -213,8 +213,6 @@ macro_optional_find_package(Lucene++ 3.0.0) macro_log_feature(LUCENEPP_FOUND "Lucene++" "The open-source, C++ search engine" "https://github.com/luceneplusplus/LucenePlusPlus/" TRUE "" "Lucene++ is used for indexing the collection") find_package(Taglib 1.8.0 REQUIRED) -include( CheckTagLibFileName ) -check_taglib_filename( COMPLEX_TAGLIB_FILENAME ) macro_optional_find_package(Sparsehash) macro_log_feature(SPARSEHASH_FOUND "Sparsehash" diff --git a/CMakeModules/CheckTagLibFileName.cmake b/CMakeModules/CheckTagLibFileName.cmake deleted file mode 100644 index e5b3706c9..000000000 --- a/CMakeModules/CheckTagLibFileName.cmake +++ /dev/null @@ -1,15 +0,0 @@ -# taglib changed filenames to be a char/wchar struct on some platforms, need to check for it -macro (CHECK_TAGLIB_FILENAME TAGLIB_FILENAME_COMPLEX) - include (CheckCXXSourceCompiles) - set (CMAKE_REQUIRED_FLAGS ${TAGLIB_CFLAGS}) - set (CMAKE_REQUIRED_INCLUDES ${TAGLIB_INCLUDES}) - set (CMAKE_REQUIRED_LIBRARIES ${TAGLIB_LIBRARIES}) - check_cxx_source_compiles( - "#include - int main() - { - TagLib::FileName fileName1(\"char\"); - TagLib::FileName fileName2(L\"wchar\"); - return 0; - }" ${TAGLIB_FILENAME_COMPLEX}) -endmacro (CHECK_TAGLIB_FILENAME) diff --git a/src/tomahawk/Config.h.in b/src/tomahawk/Config.h.in index e662103e8..bcb525f37 100644 --- a/src/tomahawk/Config.h.in +++ b/src/tomahawk/Config.h.in @@ -23,7 +23,6 @@ #cmakedefine QTSPARKLE_FOUND #cmakedefine TOMAHAWK_FINEGRAINED_MESSAGES -#cmakedefine COMPLEX_TAGLIB_FILENAME #cmakedefine HAVE_VLC_ALBUMARTIST #cmakedefine HAVE_X11