|
0 |
From: Simon McVittie <smcv@debian.org>
|
|
1 |
Date: Wed, 30 Sep 2020 16:37:52 +0200
|
|
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 dedb267..17efe75 100644
|
|
22 |
--- a/CMakeLists.txt
|
|
23 |
+++ b/CMakeLists.txt
|
|
24 |
@@ -68,8 +68,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 |
include_directories(${SDL2MIXER_INCLUDE_DIRS})
|
|
35 |
include_directories(${SDL2IMAGE_INCLUDE_DIRS})
|