Skip to content

Commit 132f26a

Browse files
authored
Fix SDL2_mixer file names to actually find the files
1 parent 544caf5 commit 132f26a

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

FindSDL2_mixer.cmake

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
# (To distribute this file outside of CMake, substitute the full
4343
# License text for the above reference.)
4444

45-
find_path(SDL2_MIXER_INCLUDE_DIR SDL_MIXER.h
45+
find_path(SDL2_MIXER_INCLUDE_DIR SDL_mixer.h
4646
HINTS
4747
ENV SDL2MIXERDIR
4848
ENV SDL2DIR
@@ -59,18 +59,18 @@ else()
5959
endif()
6060

6161
find_library(SDL2_MIXER_LIBRARY
62-
NAMES SDL2_MIXER
62+
NAMES SDL2_mixer
6363
HINTS
6464
ENV SDL2MIXERDIR
6565
ENV SDL2DIR
66-
PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}
66+
PATH_SUFFIXES lib bin ${VC_LIB_PATH_SUFFIX}
6767
PATHS ${SDL2_MIXER_PATH}
6868
)
6969

7070
if(SDL2_MIXER_INCLUDE_DIR AND EXISTS "${SDL2_MIXER_INCLUDE_DIR}/SDL_MIXER.h")
71-
file(STRINGS "${SDL2_MIXER_INCLUDE_DIR}/SDL_MIXER.h" SDL2_MIXER_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MIXER_MAJOR_VERSION[ \t]+[0-9]+$")
72-
file(STRINGS "${SDL2_MIXER_INCLUDE_DIR}/SDL_MIXER.h" SDL2_MIXER_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MIXER_MINOR_VERSION[ \t]+[0-9]+$")
73-
file(STRINGS "${SDL2_MIXER_INCLUDE_DIR}/SDL_MIXER.h" SDL2_MIXER_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_MIXER_PATCHLEVEL[ \t]+[0-9]+$")
71+
file(STRINGS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h" SDL2_MIXER_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MIXER_MAJOR_VERSION[ \t]+[0-9]+$")
72+
file(STRINGS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h" SDL2_MIXER_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MIXER_MINOR_VERSION[ \t]+[0-9]+$")
73+
file(STRINGS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h" SDL2_MIXER_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_MIXER_PATCHLEVEL[ \t]+[0-9]+$")
7474
string(REGEX REPLACE "^#define[ \t]+SDL_MIXER_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_MIXER_VERSION_MAJOR "${SDL2_MIXER_VERSION_MAJOR_LINE}")
7575
string(REGEX REPLACE "^#define[ \t]+SDL_MIXER_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_MIXER_VERSION_MINOR "${SDL2_MIXER_VERSION_MINOR_LINE}")
7676
string(REGEX REPLACE "^#define[ \t]+SDL_MIXER_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_MIXER_VERSION_PATCH "${SDL2_MIXER_VERSION_PATCH_LINE}")
@@ -88,7 +88,7 @@ set(SDL2_MIXER_INCLUDE_DIRS ${SDL2_MIXER_INCLUDE_DIR})
8888

8989
include(FindPackageHandleStandardArgs)
9090

91-
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2_MIXER
91+
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2_mixer
9292
REQUIRED_VARS SDL2_MIXER_LIBRARIES SDL2_MIXER_INCLUDE_DIRS
9393
VERSION_VAR SDL2_MIXER_VERSION_STRING)
9494

0 commit comments

Comments
 (0)