Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at 21.05 46 lines 2.0 kB view raw
1diff -ru3 SDL2-2.0.14/sdl2-config.cmake.in SDL2-2.0.14-new/sdl2-config.cmake.in 2--- SDL2-2.0.14/sdl2-config.cmake.in 2020-12-21 18:44:36.000000000 +0100 3+++ SDL2-2.0.14-new/sdl2-config.cmake.in 2021-01-16 23:53:40.721121792 +0100 4@@ -6,7 +6,8 @@ 5 set(SDL2_PREFIX "@prefix@") 6 set(SDL2_EXEC_PREFIX "@prefix@") 7 set(SDL2_LIBDIR "@libdir@") 8-set(SDL2_INCLUDE_DIRS "@includedir@/SDL2") 9+set(SDL2_INCLUDE_DIRS "@includedir@/SDL2" $ENV{SDL2_PATH}) 10+separate_arguments(SDL2_INCLUDE_DIRS) 11 set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@") 12 string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES) 13 14@@ -20,14 +21,14 @@ 15 16 add_library(SDL2::SDL2 SHARED IMPORTED) 17 set_target_properties(SDL2::SDL2 PROPERTIES 18- INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2" 19+ INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" 20 IMPORTED_LINK_INTERFACE_LANGUAGES "C" 21 IMPORTED_LOCATION "@libdir@/${CMAKE_SHARED_LIBRARY_PREFIX}SDL2${CMAKE_SHARED_LIBRARY_SUFFIX}" 22 INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS}") 23 24 add_library(SDL2::SDL2-static STATIC IMPORTED) 25 set_target_properties(SDL2::SDL2-static PROPERTIES 26- INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2" 27+ INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" 28 IMPORTED_LINK_INTERFACE_LANGUAGES "C" 29 IMPORTED_LOCATION "@libdir@/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2${CMAKE_STATIC_LIBRARY_SUFFIX}" 30 INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS_STATIC}") 31diff -ru3 SDL2-2.0.14/sdl2-config.in SDL2-2.0.14-new/sdl2-config.in 32--- SDL2-2.0.14/sdl2-config.in 2020-12-21 18:44:36.000000000 +0100 33+++ SDL2-2.0.14-new/sdl2-config.in 2021-01-16 23:57:11.940353171 +0100 34@@ -42,7 +42,11 @@ 35 echo @SDL_VERSION@ 36 ;; 37 --cflags) 38- echo -I@includedir@/SDL2 @SDL_CFLAGS@ 39+ SDL_CFLAGS="" 40+ for i in @includedir@/SDL2 $SDL2_PATH; do 41+ SDL_CFLAGS="$SDL_CFLAGS -I$i" 42+ done 43+ echo $SDL_CFLAGS @SDL_CFLAGS@ 44 ;; 45 @ENABLE_SHARED_TRUE@ --libs) 46 @ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@