Skip to content

Commit 2ab662f

Browse files
authored
Merge pull request #300 from mrikola/add-no-default-path-directives
Add NO_DEFAULT_PATH to further force local SDL libraries
2 parents 5487c19 + e9cdf3c commit 2ab662f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ ENDIF(OPENGL_FOUND)
4242
set(SDL2_DIR ${CMAKE_SOURCE_DIR}/build_ext/built_sdl)
4343

4444
set(SDL2_INCLUDE_DIRS ${SDL2_DIR}/include/SDL2)
45-
find_library(SDL2_LIBRARY SDL2 PATHS ${SDL2_DIR}/lib)
46-
find_library(SDL2MAIN_LIBRARY SDL2main PATHS ${SDL2_DIR}/lib)
45+
find_library(SDL2_LIBRARY SDL2 PATHS ${SDL2_DIR}/lib NO_DEFAULT_PATH)
46+
find_library(SDL2MAIN_LIBRARY SDL2main PATHS ${SDL2_DIR}/lib NO_DEFAULT_PATH)
4747
set(SDL2_LIBRARIES "${SDL2MAIN_LIBRARY};${SDL2_LIBRARY}")
4848

4949

@@ -52,7 +52,7 @@ set(SDL2_LIBRARIES "${SDL2MAIN_LIBRARY};${SDL2_LIBRARY}")
5252
set(SDL2_MIXER_DIR ${CMAKE_SOURCE_DIR}/build_ext/built_sdl_mixer)
5353

5454
set(SDL2_MIXER_INCLUDE_DIRS ${SDL2_MIXER_DIR}/include/SDL2)
55-
find_library(SDL2_MIXER_LIBRARY SDL2_mixer PATHS ${SDL2_MIXER_DIR}/lib)
55+
find_library(SDL2_MIXER_LIBRARY SDL2_mixer PATHS ${SDL2_MIXER_DIR}/lib NO_DEFAULT_PATH)
5656
set(SDL2_MIXER_LIBRARIES ${SDL2_MIXER_LIBRARY})
5757

5858
add_definitions(-DUSE_SDL_MIXER=1)

0 commit comments

Comments
 (0)