From 110fb75513301af5400df0b9c499510a90684dc6 Mon Sep 17 00:00:00 2001 From: Jan Haller Date: Sun, 8 Dec 2019 10:27:09 +0100 Subject: [PATCH] Rename FindVorbis -> FindVORBIS, for consistency with exported variables (e.g. VORBIS_FOUND) Fixes #1626 --- cmake/Modules/{FindVorbis.cmake => FindVORBIS.cmake} | 0 src/SFML/Audio/CMakeLists.txt | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename cmake/Modules/{FindVorbis.cmake => FindVORBIS.cmake} (100%) diff --git a/cmake/Modules/FindVorbis.cmake b/cmake/Modules/FindVORBIS.cmake similarity index 100% rename from cmake/Modules/FindVorbis.cmake rename to cmake/Modules/FindVORBIS.cmake diff --git a/src/SFML/Audio/CMakeLists.txt b/src/SFML/Audio/CMakeLists.txt index 420e13b55..ab97a37c6 100644 --- a/src/SFML/Audio/CMakeLists.txt +++ b/src/SFML/Audio/CMakeLists.txt @@ -67,11 +67,11 @@ endif() # find external libraries 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") # 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") # define the sfml-audio target @@ -87,4 +87,4 @@ endif() target_link_libraries(sfml-audio PUBLIC sfml-system - PRIVATE Vorbis FLAC) + PRIVATE VORBIS FLAC)