ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Place bundled SFML include paths before others 

This allows to build with bundled SFML when system SFML (of another
version) is installed
This commit is contained in:
Dmitry Marakasov 2014-08-20 17:44:18 +04:00
parent a09cf1d8f1
commit 99df57a35e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -618,7 +618,7 @@ if(SFML_FOUND AND NOT SFML_VERSION_MAJOR) # SFML 1.x doesn't define SFML_VERSION
else()
message("Using static SFML ${SFML_FIND_VERSION_MAJOR}.${SFML_FIND_VERSION_MINOR} from Externals")
add_subdirectory(Externals/SFML)
include_directories(Externals/SFML/include)
include_directories(BEFORE Externals/SFML/include)
endif()
if(USE_UPNP)

2
Externals/SFML/CMakeLists.txt vendored
View File

@ -1,4 +1,4 @@
include_directories(include)
include_directories(BEFORE include)
set(SRCS src/SFML/Network/Ftp.cpp
src/SFML/Network/Http.cpp