zdoom/zdoom-macos-deps
0
0
Fork 0
mirror of https://github.com/ZDoom/zdoom-macos-deps.git synced 2024-11-24 04:41:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

rebuild vorbis to remove full paths for libraries

Browse source
This commit is contained in:
alexey.lysiuk 2022-08-27 11:01:02 +03:00
parent c4e1d00a43
commit c09b5ea99e
6 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
deps/vorbis/lib/cmake/Vorbis/VorbisConfigVersion.cmake vendored
View file

@ -17,10 +17,28 @@ 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_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()
if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
set(PACKAGE_VERSION_COMPATIBLE TRUE)
else()
@ -30,6 +48,7 @@ else()
if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
set(PACKAGE_VERSION_EXACT TRUE)
endif()
endif()
endif()

2
deps/vorbis/lib/cmake/Vorbis/VorbisTargets.cmake vendored
View file

@ -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.
#----------------------------------------------------------------

BIN
deps/vorbis/lib/libvorbis.a vendored
View file

Binary file not shown.

BIN
deps/vorbis/lib/libvorbisenc.a vendored
View file

Binary file not shown.

BIN
deps/vorbis/lib/libvorbisfile.a vendored
View file

Binary file not shown.

2
deps/vorbis/lib/pkgconfig/vorbis.pc vendored
View file

@ -11,5 +11,5 @@ Version: 1.3.7
Requires.private: ogg
Conflicts:
Libs: -L${libdir} -lvorbis
Libs.private: -lm
Libs.private:
Cflags: -I${includedir}