From 99df57a35edc286d2d4cb00ed28a9ff53c8924e5 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Wed, 20 Aug 2014 17:44:18 +0400 Subject: [PATCH] Place bundled SFML include paths before others This allows to build with bundled SFML when system SFML (of another version) is installed --- CMakeLists.txt | 2 +- Externals/SFML/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be92b6c222..d7c25ae75c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/Externals/SFML/CMakeLists.txt b/Externals/SFML/CMakeLists.txt index 86c086420d..b03bd713c0 100644 --- a/Externals/SFML/CMakeLists.txt +++ b/Externals/SFML/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(include) +include_directories(BEFORE include) set(SRCS src/SFML/Network/Ftp.cpp src/SFML/Network/Http.cpp