From: Michael Janssen Date: Mon, 19 Mar 2012 17:53:45 -0500 Subject: Update for new libgeos FTBFS --- client_libs/libplayerc/CMakeLists.txt | 2 +- libplayerwkb/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client_libs/libplayerc/CMakeLists.txt b/client_libs/libplayerc/CMakeLists.txt index d43648b..0352787 100644 --- a/client_libs/libplayerc/CMakeLists.txt +++ b/client_libs/libplayerc/CMakeLists.txt @@ -72,7 +72,7 @@ IF (HAVE_Z) PLAYERC_ADD_LINK_LIB (z) ENDIF (HAVE_Z) IF (HAVE_GEOS) - PLAYERC_ADD_LINK_LIB (geos geos_c) + PLAYERC_ADD_LINK_LIB (geos_c) ENDIF (HAVE_GEOS) IF (PLAYER_OS_QNX) PLAYERC_ADD_LINK_LIB (socket rpc) diff --git a/libplayerwkb/CMakeLists.txt b/libplayerwkb/CMakeLists.txt index c50dc8e..877ca3a 100644 --- a/libplayerwkb/CMakeLists.txt +++ b/libplayerwkb/CMakeLists.txt @@ -2,9 +2,9 @@ SET (playerwkbSrcs playerwkb.c) PLAYER_ADD_LIBRARY (playerwkb ${playerwkbSrcs}) IF (HAVE_GEOS) - TARGET_LINK_LIBRARIES (playerwkb playercommon geos geos_c) + TARGET_LINK_LIBRARIES (playerwkb playercommon geos_c) PLAYERCORE_ADD_INT_LINK_LIB (geos_c) - SET (wkbLibFlag "-lgeos -lgeos_c") + SET (wkbLibFlag "-lgeos_c") ELSE (HAVE_GEOS) TARGET_LINK_LIBRARIES (playerwkb playercommon) SET (wkbLibFlag)