Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at python-updates 31 lines 1.3 kB view raw
1diff --git a/SDL2Config.cmake.in b/SDL2Config.cmake.in 2index 80c1b99..54f50e6 100644 3--- a/SDL2Config.cmake.in 4+++ b/SDL2Config.cmake.in 5@@ -45,7 +45,8 @@ endif() 6 set(SDL2_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@") 7 set(SDL2_EXEC_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@") 8 set(SDL2_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_FULL_INCLUDEDIR@/SDL2") 9-set(SDL2_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_FULL_INCLUDEDIR@;@PACKAGE_CMAKE_INSTALL_FULL_INCLUDEDIR@/SDL2") 10+set(SDL2_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_FULL_INCLUDEDIR@;@PACKAGE_CMAKE_INSTALL_FULL_INCLUDEDIR@/SDL2" $ENV{SDL2_PATH}) 11+separate_arguments(SDL2_INCLUDE_DIRS) 12 set(SDL2_BINDIR "@PACKAGE_CMAKE_INSTALL_FULL_BINDIR@") 13 set(SDL2_LIBDIR "@PACKAGE_CMAKE_INSTALL_FULL_LIBDIR@") 14 set(SDL2_LIBRARIES SDL2::SDL2) 15diff --git a/sdl2-config.in b/sdl2-config.in 16index d21b1b2..bb0d624 100644 17--- a/sdl2-config.in 18+++ b/sdl2-config.in 19@@ -50,7 +50,11 @@ while test $# -gt 0; do 20 echo @PROJECT_VERSION@ 21 ;; 22 --cflags) 23- echo -I${includedir}/SDL2 @SDL_CFLAGS@ 24+ SDL_CFLAGS="" 25+ for i in @includedir@/SDL2 $SDL2_PATH; do 26+ SDL_CFLAGS="$SDL_CFLAGS -I$i" 27+ done 28+ echo $SDL_CFLAGS @SDL_CFLAGS@ 29 ;; 30 @ENABLE_SHARED_TRUE@ --libs) 31 @ENABLE_SHARED_TRUE@ echo -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@