# HG changeset patch # User Azamat H. Hackimov # Date 1524300242 -10800 # Sat Apr 21 11:44:02 2018 +0300 # Node ID 2dda6d7ed3f509e58b5b4b00dfd34637045905a7 # Parent ffd52bb02bcc81202f8bf719fec2f5ec3e0eaf4c Revorked basic variables initialization in configure When you compile SDL2, generated sdl2.pc file contains leading spaces in "Libs" variable, which threated by new CMake as error: CMake Error at CMakeLists.txt (add_executable): Target "TestSimpleMain" links to item "-L/usr/lib64 -lSDL2 " which has leading or trailing whitespace. This is now an error according to policy CMP0004. This commit fixes that error by appending variable to list instead appending to string. Fixes bug https://bugzilla.libsdl.org/show_bug.cgi?id=4144 diff -r ffd52bb02bcc -r 2dda6d7ed3f5 configure --- a/configure Mon Apr 16 02:11:09 2018 -0400 +++ b/configure Sat Apr 21 11:44:02 2018 +0300 @@ -15752,10 +15752,16 @@ # fi #done SDL_CFLAGS="$BASE_CFLAGS" -SDL_LIBS="-lSDL2 $BASE_LDFLAGS" -CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS" -CFLAGS="$CFLAGS $EXTRA_CFLAGS" -LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" +SDL_LIBS="-lSDL2" +CPPFLAGS="$CPPFLAGS" +CFLAGS="$CFLAGS" +LDFLAGS="$LDFLAGS" + +$SDL_LIBS+="$BASE_LDFLAGS" +$CPPFLAGS+="$EXTRA_CFLAGS" +$CFLAGS+="$EXTRA_CFLAGS" +$LDFLAGS+="$EXTRA_LDFLAGS" + base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'` diff -r ffd52bb02bcc -r 2dda6d7ed3f5 configure.in --- a/configure.in Mon Apr 16 02:11:09 2018 -0400 +++ b/configure.in Sat Apr 21 11:44:02 2018 +0300 @@ -123,10 +123,16 @@ # fi #done SDL_CFLAGS="$BASE_CFLAGS" -SDL_LIBS="-lSDL2 $BASE_LDFLAGS" -CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS" -CFLAGS="$CFLAGS $EXTRA_CFLAGS" -LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" +SDL_LIBS="-lSDL2" +CPPFLAGS="$CPPFLAGS" +CFLAGS="$CFLAGS" +LDFLAGS="$LDFLAGS" + +$SDL_LIBS+="$BASE_LDFLAGS" +$CPPFLAGS+="$EXTRA_CFLAGS" +$CFLAGS+="$EXTRA_CFLAGS" +$LDFLAGS+="$EXTRA_LDFLAGS" + dnl set this to use on systems that use lib64 instead of lib base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'`