From db94dfb1d5ec08777918352bbf6c65666d2e09b7 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 23 Apr 2018 21:55:59 -0700 Subject: [PATCH] Fixed bug 4144 - CMake complains about trailing spaces in sdl2.pc Azamat H. Hackimov When you try use SDL2 2.0.8 in CMake project in Linux, it complains about trailing spaces in sdl2.pc: CMake Error at CMakeLists.txt:147 (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. --- configure | 15 +++++++++++---- configure.in | 15 +++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/configure b/configure index e932dce76cdc4..d8fc074b0fe51 100755 --- a/configure +++ b/configure @@ -15752,10 +15752,17 @@ EXTRA_LDFLAGS="$BASE_LDFLAGS" # 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" +if "$BASE_LDFLAGS" != "" ; then + SDL_LIBS="$SDL_LIBS $BASE_LDFLAGS" +fi +if "$EXTRA_CFLAGS" != "" ; then + CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS" + CFLAGS="$CFLAGS $EXTRA_CFLAGS" +fi +if "$EXTRA_LDFLAGS" != "" ; then + LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" +fi base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'` diff --git a/configure.in b/configure.in index 9d815dbc3d62b..1b9935c713aac 100644 --- a/configure.in +++ b/configure.in @@ -123,10 +123,17 @@ EXTRA_LDFLAGS="$BASE_LDFLAGS" # 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" +if [ "$BASE_LDFLAGS" != "" ]; then + SDL_LIBS="$SDL_LIBS $BASE_LDFLAGS" +fi +if [ "$EXTRA_CFLAGS" != "" ]; then + CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS" + CFLAGS="$CFLAGS $EXTRA_CFLAGS" +fi +if [ "$EXTRA_LDFLAGS" != "" ]; then + LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" +fi dnl set this to use on systems that use lib64 instead of lib base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'`