Skip to content

Commit b60e975

Browse files
committed
cmake: CMAKE_MODULE_PATH only needs to be modified when using a static SDL2_mixer
(cherry picked from commit a9c1736)
1 parent b1ee9b9 commit b60e975

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

SDL2_mixerConfig.cmake.in

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,14 @@ set(SDL2MIXER_WAVE @SDL2MIXER_WAVE@)
4343
set(SDL2MIXER_WAVPACK @SDL2MIXER_WAVPACK@)
4444

4545
set(SDL2MIXER_SDL2_REQUIRED_VERSION @SDL_REQUIRED_VERSION@)
46-
47-
if(NOT SDL2MIXER_VENDORED)
48-
set(_sdl_cmake_module_path "${CMAKE_MODULE_PATH}")
49-
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
50-
endif()
51-
5246
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer-shared-targets.cmake")
5347
include("${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer-shared-targets.cmake")
5448
endif()
5549

5650
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer-static-targets.cmake")
51+
set(_sdl_cmake_module_path "${CMAKE_MODULE_PATH}")
52+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
53+
5754
include(CMakeFindDependencyMacro)
5855
include(PkgConfigHelper)
5956

@@ -113,9 +110,7 @@ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer-static-targets.cmake")
113110
endif()
114111
endif()
115112
include("${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer-static-targets.cmake")
116-
endif()
117113

118-
if(NOT SDL2MIXER_VENDORED)
119114
set(CMAKE_MODULE_PATH "${_sdl_cmake_module_path}")
120115
unset(_sdl_cmake_module_path)
121116
endif()

0 commit comments

Comments
 (0)