From 1a1696f9b63024fcd081d5521ca43b198639b29d Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 21 Aug 2019 10:54:40 +0200 Subject: [PATCH] SDL2: don't mix space-separated / lists in cmake config The SDL2_PATH environment variable is space-separated. However, CMake lists are semicolon separated, and doing set(list "a" ${var}) will end up with list containing "a;b c d". This causes downstream users to fail parsing the include dirs list. Normalize the include dirs list to a normal CMake semicolon-separated list using separate_arguments. --- pkgs/development/libraries/SDL2/find-headers.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/SDL2/find-headers.patch b/pkgs/development/libraries/SDL2/find-headers.patch index a6114901055..a6b10ddb7ed 100644 --- a/pkgs/development/libraries/SDL2/find-headers.patch +++ b/pkgs/development/libraries/SDL2/find-headers.patch @@ -1,12 +1,13 @@ diff -ru3 SDL2-2.0.4/sdl2-config.cmake.in SDL2-2.0.4-new/sdl2-config.cmake.in --- SDL2-2.0.4/sdl2-config.cmake.in 2016-01-02 22:56:31.000000000 +0300 +++ SDL2-2.0.4-new/sdl2-config.cmake.in 2016-08-22 05:26:42.420397323 +0300 -@@ -6,5 +6,5 @@ +@@ -6,5 +6,6 @@ set(SDL2_PREFIX "@prefix@") set(SDL2_EXEC_PREFIX "@prefix@") set(SDL2_LIBDIR "@libdir@") -set(SDL2_INCLUDE_DIRS "@includedir@/SDL2") +set(SDL2_INCLUDE_DIRS "@includedir@/SDL2" $ENV{SDL2_PATH}) ++separate_arguments(SDL2_INCLUDE_DIRS) set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@") diff -ru3 SDL2-2.0.4/sdl2-config.in SDL2-2.0.4-new/sdl2-config.in --- SDL2-2.0.4/sdl2-config.in 2016-01-02 22:56:31.000000000 +0300