From: Tsuda Kageyu Date: Sat, 13 Feb 2016 18:17:37 +0000 (+0900) Subject: Disable Boost Endian library for now. X-Git-Tag: v1.11beta2~28 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb006e41d702afeca1c8ff56dc7c748666f9938f;p=taglib Disable Boost Endian library for now. It's not detected properly depending on the environment. --- diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 0e6eb628..aef79294 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -34,13 +34,6 @@ if(NOT ${SIZEOF_DOUBLE} EQUAL 8) message(FATAL_ERROR "TagLib requires that double is 64-bit wide.") endif() -# Determine whether Boost "header-only" libraries are installed. - -find_package(Boost) -if(Boost_FOUND) - set(Boost_VERSION "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}") -endif() - # Determine which kind of atomic operations your compiler supports. check_cxx_source_compiles(" @@ -109,64 +102,58 @@ endif() # Determine which kind of byte swap functions your compiler supports. -if(Boost_FOUND AND NOT (Boost_VERSION VERSION_LESS "1.58.0")) - set(HAVE_BOOST_BYTESWAP 1) -endif() +check_cxx_source_compiles(" + int main() { + __builtin_bswap16(0); + __builtin_bswap32(0); + __builtin_bswap64(0); + return 0; + } +" HAVE_GCC_BYTESWAP) -if(NOT HAVE_BOOST_BYTESWAP) +if(NOT HAVE_GCC_BYTESWAP) check_cxx_source_compiles(" + #include int main() { - __builtin_bswap16(0); - __builtin_bswap32(0); - __builtin_bswap64(0); + __bswap_16(0); + __bswap_32(0); + __bswap_64(0); return 0; } - " HAVE_GCC_BYTESWAP) + " HAVE_GLIBC_BYTESWAP) - if(NOT HAVE_GCC_BYTESWAP) + if(NOT HAVE_GLIBC_BYTESWAP) check_cxx_source_compiles(" - #include + #include int main() { - __bswap_16(0); - __bswap_32(0); - __bswap_64(0); + _byteswap_ushort(0); + _byteswap_ulong(0); + _byteswap_uint64(0); return 0; } - " HAVE_GLIBC_BYTESWAP) + " HAVE_MSC_BYTESWAP) - if(NOT HAVE_GLIBC_BYTESWAP) + if(NOT HAVE_MSC_BYTESWAP) check_cxx_source_compiles(" - #include + #include int main() { - _byteswap_ushort(0); - _byteswap_ulong(0); - _byteswap_uint64(0); + OSSwapInt16(0); + OSSwapInt32(0); + OSSwapInt64(0); return 0; } - " HAVE_MSC_BYTESWAP) + " HAVE_MAC_BYTESWAP) - if(NOT HAVE_MSC_BYTESWAP) + if(NOT HAVE_MAC_BYTESWAP) check_cxx_source_compiles(" - #include + #include int main() { - OSSwapInt16(0); - OSSwapInt32(0); - OSSwapInt64(0); + swap16(0); + swap32(0); + swap64(0); return 0; } - " HAVE_MAC_BYTESWAP) - - if(NOT HAVE_MAC_BYTESWAP) - check_cxx_source_compiles(" - #include - int main() { - swap16(0); - swap32(0); - swap64(0); - return 0; - } - " HAVE_OPENBSD_BYTESWAP) - endif() + " HAVE_OPENBSD_BYTESWAP) endif() endif() endif() diff --git a/config.h.cmake b/config.h.cmake index 7ac72410..cfaa8eac 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1,7 +1,6 @@ /* config.h. Generated by cmake from config.h.cmake */ /* Defined if your compiler supports some byte swap functions */ -#cmakedefine HAVE_BOOST_BYTESWAP 1 #cmakedefine HAVE_GCC_BYTESWAP 1 #cmakedefine HAVE_GLIBC_BYTESWAP 1 #cmakedefine HAVE_MSC_BYTESWAP 1 diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt index 8e67d709..cc2b7611 100644 --- a/taglib/CMakeLists.txt +++ b/taglib/CMakeLists.txt @@ -32,7 +32,7 @@ elseif(HAVE_ZLIB_SOURCE) include_directories(${ZLIB_SOURCE}) endif() -if(HAVE_BOOST_ATOMIC OR HAVE_BOOST_BYTESWAP) +if(HAVE_BOOST_ATOMIC) include_directories(${Boost_INCLUDE_DIR}) endif() diff --git a/taglib/toolkit/tutils.h b/taglib/toolkit/tutils.h index 9a81fd8b..69eccec2 100644 --- a/taglib/toolkit/tutils.h +++ b/taglib/toolkit/tutils.h @@ -34,9 +34,7 @@ # include #endif -#if defined(HAVE_BOOST_BYTESWAP) -# include -#elif defined(HAVE_MSC_BYTESWAP) +#if defined(HAVE_MSC_BYTESWAP) # include #elif defined(HAVE_GLIBC_BYTESWAP) # include @@ -61,11 +59,7 @@ namespace TagLib */ inline unsigned short byteSwap(unsigned short x) { -#if defined(HAVE_BOOST_BYTESWAP) - - return boost::endian::endian_reverse(static_cast(x)); - -#elif defined(HAVE_GCC_BYTESWAP) +#if defined(HAVE_GCC_BYTESWAP) return __builtin_bswap16(x); @@ -97,11 +91,7 @@ namespace TagLib */ inline unsigned int byteSwap(unsigned int x) { -#if defined(HAVE_BOOST_BYTESWAP) - - return boost::endian::endian_reverse(static_cast(x)); - -#elif defined(HAVE_GCC_BYTESWAP) +#if defined(HAVE_GCC_BYTESWAP) return __builtin_bswap32(x); @@ -136,11 +126,7 @@ namespace TagLib */ inline unsigned long long byteSwap(unsigned long long x) { -#if defined(HAVE_BOOST_BYTESWAP) - - return boost::endian::endian_reverse(static_cast(x)); - -#elif defined(HAVE_GCC_BYTESWAP) +#if defined(HAVE_GCC_BYTESWAP) return __builtin_bswap64(x);