mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 04:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename FindVorbis -> FindVORBIS, for consistency with exported variables (e.g. VORBIS_FOUND)

Browse Source 
Fixes #1626
This commit is contained in:
Jan Haller 2019-12-08 10:27:09 +01:00 committed by Lukas Dürrenberger
parent 519e1f9572
commit 110fb75513
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
cmake/Modules/FindVorbis.cmake → cmake/Modules/FindVORBIS.cmake
View File

6
src/SFML/Audio/CMakeLists.txt
View File

@ -67,11 +67,11 @@ endif()
# find external libraries # find external libraries
sfml_find_package(OpenAL INCLUDE "OPENAL_INCLUDE_DIR" LINK "OPENAL_LIBRARY") sfml_find_package(OpenAL INCLUDE "OPENAL_INCLUDE_DIR" LINK "OPENAL_LIBRARY")
sfml_find_package(Vorbis INCLUDE "VORBIS_INCLUDE_DIRS" LINK "VORBIS_LIBRARIES") sfml_find_package(VORBIS INCLUDE "VORBIS_INCLUDE_DIRS" LINK "VORBIS_LIBRARIES")
sfml_find_package(FLAC INCLUDE "FLAC_INCLUDE_DIR" LINK "FLAC_LIBRARY") sfml_find_package(FLAC INCLUDE "FLAC_INCLUDE_DIR" LINK "FLAC_LIBRARY")
# avoids warnings in vorbisfile.h # avoids warnings in vorbisfile.h
target_compile_definitions(Vorbis INTERFACE "OV_EXCLUDE_STATIC_CALLBACKS") target_compile_definitions(VORBIS INTERFACE "OV_EXCLUDE_STATIC_CALLBACKS")
target_compile_definitions(FLAC INTERFACE "FLAC__NO_DLL") target_compile_definitions(FLAC INTERFACE "FLAC__NO_DLL")
# define the sfml-audio target # define the sfml-audio target
@ -87,4 +87,4 @@ endif()
target_link_libraries(sfml-audio target_link_libraries(sfml-audio
PUBLIC sfml-system PUBLIC sfml-system
PRIVATE Vorbis FLAC) PRIVATE VORBIS FLAC)