Drop build-Add-include-directories-for-all-SDL2_foo-modules.patch
Markus Koschany
3 years ago
| 0 | From: Simon McVittie <smcv@debian.org> | |
| 1 | Date: Sun, 23 Feb 2020 14:28:29 +0000 | |
| 2 | Subject: build: Add include directories for all SDL2_foo modules | |
| 3 | ||
| 4 | The build system assumed that SDL2 and all the SDL2_foo libraries were | |
| 5 | installed with the same ${includedir}, but this is not guaranteed: | |
| 6 | we could be using a system copy of SDL2 in conjunction with SDL2_foo | |
| 7 | libraries in a non-standard prefix. | |
| 8 | ||
| 9 | This also fixes a build regression with recent Debian SDL2 packages, in | |
| 10 | which the SDL2 headers are installed in an architecture-dependent | |
| 11 | directory but the SDL2_foo headers are not. | |
| 12 | ||
| 13 | Signed-off-by: Simon McVittie <smcv@debian.org> | |
| 14 | Forwarded: no | |
| 15 | Bug-Debian: https://bugs.debian.org/951943 | |
| 16 | --- | |
| 17 | CMakeLists.txt | 3 +++ | |
| 18 | 1 file changed, 3 insertions(+) | |
| 19 | ||
| 20 | diff --git a/CMakeLists.txt b/CMakeLists.txt | |
| 21 | index d4d7644..91bdcbf 100644 | |
| 22 | --- a/CMakeLists.txt | |
| 23 | +++ b/CMakeLists.txt | |
| 24 | @@ -60,8 +60,11 @@ include_directories(${SDL2_INCLUDE_DIR}) | |
| 25 | #Setup things that use pkg-config | |
| 26 | find_package(PkgConfig REQUIRED) | |
| 27 | pkg_search_module(SDL2MIXER REQUIRED SDL2_mixer) | |
| 28 | +include_directories(${SDL2MIXER_INCLUDE_DIRS}) | |
| 29 | pkg_search_module(SDL2IMAGE REQUIRED SDL2_image) | |
| 30 | +include_directories(${SDL2IMAGE_INCLUDE_DIRS}) | |
| 31 | pkg_search_module(SDL2TTF REQUIRED SDL2_ttf) | |
| 32 | +include_directories(${SDL2TTF_INCLUDE_DIRS}) | |
| 33 | ||
| 34 | find_package(Boost COMPONENTS program_options REQUIRED) | |
| 35 |