diff --git a/deps/vorbis/lib/cmake/Vorbis/VorbisConfigVersion.cmake b/deps/vorbis/lib/cmake/Vorbis/VorbisConfigVersion.cmake index 03bc3884..86bf7a35 100644 --- a/deps/vorbis/lib/cmake/Vorbis/VorbisConfigVersion.cmake +++ b/deps/vorbis/lib/cmake/Vorbis/VorbisConfigVersion.cmake @@ -17,18 +17,37 @@ else() if("1.3.7" MATCHES "^([0-9]+)\\.") set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}") + if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0) + string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}") + endif() else() set(CVF_VERSION_MAJOR "1.3.7") endif() - if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR) - set(PACKAGE_VERSION_COMPATIBLE TRUE) + if(PACKAGE_FIND_VERSION_RANGE) + # both endpoints of the range must have the expected major version + math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1") + if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR + OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR) + OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT))) + set(PACKAGE_VERSION_COMPATIBLE FALSE) + elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR + AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX) + OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX))) + set(PACKAGE_VERSION_COMPATIBLE TRUE) + else() + set(PACKAGE_VERSION_COMPATIBLE FALSE) + endif() else() - set(PACKAGE_VERSION_COMPATIBLE FALSE) - endif() + if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR) + set(PACKAGE_VERSION_COMPATIBLE TRUE) + else() + set(PACKAGE_VERSION_COMPATIBLE FALSE) + endif() - if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) + if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) set(PACKAGE_VERSION_EXACT TRUE) + endif() endif() endif() diff --git a/deps/vorbis/lib/cmake/Vorbis/VorbisTargets.cmake b/deps/vorbis/lib/cmake/Vorbis/VorbisTargets.cmake index 960ce266..b54f247e 100644 --- a/deps/vorbis/lib/cmake/Vorbis/VorbisTargets.cmake +++ b/deps/vorbis/lib/cmake/Vorbis/VorbisTargets.cmake @@ -4,7 +4,7 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) message(FATAL_ERROR "CMake >= 2.6.0 required") endif() cmake_policy(PUSH) -cmake_policy(VERSION 2.6...3.17) +cmake_policy(VERSION 2.6...3.19) #---------------------------------------------------------------- # Generated CMake target import file. #---------------------------------------------------------------- diff --git a/deps/vorbis/lib/libvorbis.a b/deps/vorbis/lib/libvorbis.a index 1a9da8bb..4c1033b6 100644 Binary files a/deps/vorbis/lib/libvorbis.a and b/deps/vorbis/lib/libvorbis.a differ diff --git a/deps/vorbis/lib/libvorbisenc.a b/deps/vorbis/lib/libvorbisenc.a index d9246795..52c2ca99 100644 Binary files a/deps/vorbis/lib/libvorbisenc.a and b/deps/vorbis/lib/libvorbisenc.a differ diff --git a/deps/vorbis/lib/libvorbisfile.a b/deps/vorbis/lib/libvorbisfile.a index 1376507d..c554383c 100644 Binary files a/deps/vorbis/lib/libvorbisfile.a and b/deps/vorbis/lib/libvorbisfile.a differ diff --git a/deps/vorbis/lib/pkgconfig/vorbis.pc b/deps/vorbis/lib/pkgconfig/vorbis.pc index 2f2355d0..d76fcbce 100644 --- a/deps/vorbis/lib/pkgconfig/vorbis.pc +++ b/deps/vorbis/lib/pkgconfig/vorbis.pc @@ -11,5 +11,5 @@ Version: 1.3.7 Requires.private: ogg Conflicts: Libs: -L${libdir} -lvorbis -Libs.private: -lm +Libs.private: Cflags: -I${includedir}