Skip to content

Commit

Permalink
Merge pull request #300 from mrikola/add-no-default-path-directives
Browse files Browse the repository at this point in the history 
Add NO_DEFAULT_PATH to further force local SDL libraries
  • Loading branch information
@Interrupt
Interrupt authored Mar 27, 2019
2 parents 5487c19 + e9cdf3c commit 2ab662f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ ENDIF(OPENGL_FOUND)
set(SDL2_DIR ${CMAKE_SOURCE_DIR}/build_ext/built_sdl)

set(SDL2_INCLUDE_DIRS ${SDL2_DIR}/include/SDL2)
find_library(SDL2_LIBRARY SDL2 PATHS ${SDL2_DIR}/lib)
find_library(SDL2MAIN_LIBRARY SDL2main PATHS ${SDL2_DIR}/lib)
find_library(SDL2_LIBRARY SDL2 PATHS ${SDL2_DIR}/lib NO_DEFAULT_PATH)
find_library(SDL2MAIN_LIBRARY SDL2main PATHS ${SDL2_DIR}/lib NO_DEFAULT_PATH)
set(SDL2_LIBRARIES "${SDL2MAIN_LIBRARY};${SDL2_LIBRARY}")


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

set(SDL2_MIXER_INCLUDE_DIRS ${SDL2_MIXER_DIR}/include/SDL2)
find_library(SDL2_MIXER_LIBRARY SDL2_mixer PATHS ${SDL2_MIXER_DIR}/lib)
find_library(SDL2_MIXER_LIBRARY SDL2_mixer PATHS ${SDL2_MIXER_DIR}/lib NO_DEFAULT_PATH)
set(SDL2_MIXER_LIBRARIES ${SDL2_MIXER_LIBRARY})

add_definitions(-DUSE_SDL_MIXER=1)
Expand Down

0 comments on commit 2ab662f

Please sign in to comment.