public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL2: don't mix space-separated / lists in cmake config

Browse Source 
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.
This commit is contained in:
Pierre Bourdon
2019-08-22 11:41:16 +03:00
committed by Nikolay Amiantov
parent e43834650f
commit 1a1696f9b6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/SDL2/find-headers.patch
+2 -1
View File
@@ -1,12 +1,13 @@
diff -ru3 SDL2-2.0.4/sdl2-config.cmake.in SDL2-2.0.4-new/sdl2-config.cmake.in 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/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 +++ 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_PREFIX "@prefix@")
set(SDL2_EXEC_PREFIX "@prefix@") set(SDL2_EXEC_PREFIX "@prefix@")
set(SDL2_LIBDIR "@libdir@") set(SDL2_LIBDIR "@libdir@")
-set(SDL2_INCLUDE_DIRS "@includedir@/SDL2") -set(SDL2_INCLUDE_DIRS "@includedir@/SDL2")
+set(SDL2_INCLUDE_DIRS "@includedir@/SDL2" $ENV{SDL2_PATH}) +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@") 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 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 --- SDL2-2.0.4/sdl2-config.in 2016-01-02 22:56:31.000000000 +0300