From bc6fe4b150c264e046e08bd69155c805c22284e2 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 23 Feb 2020 18:12:58 +0000 Subject: [PATCH] Avoid making assumptions about location of SDL2 headers It is not an API guarantee that the SDL2 headers will be found in ${prefix}/include/SDL2, or that SDL2 is installed in the same prefix as planetblupi itself. Ask pkg-config instead. Signed-off-by: Simon McVittie Bug-Debian: https://bugs.debian.org/952105 Forwarded: no --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5723efd..f067233 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,6 @@ include (${CMAKE_ROOT}/Modules/ExternalProject.cmake) include ("${CMAKE_SOURCE_DIR}/cmake/Ronn2Man.cmake") include_directories (${CMAKE_INSTALL_PREFIX}/include) -include_directories (${CMAKE_INSTALL_PREFIX}/include/SDL2) link_directories (${CMAKE_INSTALL_PREFIX}/lib) project (planetblupi) @@ -153,10 +152,13 @@ include_directories (${SDLKitchensink_INCLUDE_DIRS}) find_package (PkgConfig REQUIRED) if (NOT BUILD_JS) pkg_search_module (SDL2 REQUIRED sdl2) + include_directories (${SDL2_INCLUDE_DIRS}) set (planetblupi_DEPS ${planetblupi_DEPS} ${SDL2_STATIC_LIBRARIES}) pkg_search_module (SDL2_IMAGE REQUIRED SDL2_image) + include_directories (${SDL2_IMAGE_INCLUDE_DIRS}) set (planetblupi_DEPS ${planetblupi_DEPS} ${SDL2_IMAGE_STATIC_LIBRARIES}) pkg_search_module (SDL2_MIXER REQUIRED SDL2_mixer) + include_directories (${SDL2_MIXER_INCLUDE_DIRS}) set (planetblupi_DEPS ${planetblupi_DEPS} ${SDL2_MIXER_STATIC_LIBRARIES}) endif ()