Revision: 7540
http://playerstage.svn.sourceforge.net/playerstage/?rev=7540&view=rev
Author: gbiggs
Date: 2009-03-24 15:56:04 +0000 (Tue, 24 Mar 2009)
Log Message:
-----------
Fixed issues with finding geos
Modified Paths:
--------------
code/player/trunk/client_libs/libplayerc/CMakeLists.txt
code/player/trunk/cmake/internal/SearchForStuff.cmake
code/player/trunk/server/drivers/vectormap/CMakeLists.txt
Modified: code/player/trunk/client_libs/libplayerc/CMakeLists.txt
===================================================================
--- code/player/trunk/client_libs/libplayerc/CMakeLists.txt 2009-03-23
19:09:46 UTC (rev 7539)
+++ code/player/trunk/client_libs/libplayerc/CMakeLists.txt 2009-03-24
15:56:04 UTC (rev 7540)
@@ -81,7 +81,8 @@
APPEND_TO_CACHED_LIST (PLAYERC_EXTRA_LINK_LIBRARIES "Libs to link to with
playerc" z)
ENDIF (HAVE_Z)
IF (HAVE_GEOS)
- TARGET_LINK_LIBRARIES (playerc ${GEOS_LIBS})
+ TARGET_LINK_LIBRARIES (playerc geos geos_c)
+ APPEND_TO_CACHED_LIST (PLAYERC_EXTRA_LINK_LIBRARIES "Libs to link to with
playerc" geos geos_c)
ENDIF (HAVE_GEOS)
IF (PLAYER_OS_QNX)
TARGET_LINK_LIBRARIES (playerc socket rpc)
Modified: code/player/trunk/cmake/internal/SearchForStuff.cmake
===================================================================
--- code/player/trunk/cmake/internal/SearchForStuff.cmake 2009-03-23
19:09:46 UTC (rev 7539)
+++ code/player/trunk/cmake/internal/SearchForStuff.cmake 2009-03-24
15:56:04 UTC (rev 7540)
@@ -120,6 +120,9 @@
SET (HAVE_CLOCK_GETTIME TRUE)
ENDIF (HAVE_LIBRT AND HAVE_CLOCK_GETTIME_FUNC)
+# Geos check
+CHECK_LIBRARY_EXISTS (geos_c GEOSGeomFromWKB_buf "${PLAYER_EXTRA_LIB_DIRS}"
HAVE_GEOS)
+
# Endianess check
INCLUDE (TestBigEndian)
TEST_BIG_ENDIAN (WORDS_BIGENDIAN)
Modified: code/player/trunk/server/drivers/vectormap/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/vectormap/CMakeLists.txt 2009-03-23
19:09:46 UTC (rev 7539)
+++ code/player/trunk/server/drivers/vectormap/CMakeLists.txt 2009-03-24
15:56:04 UTC (rev 7540)
@@ -1,4 +1,8 @@
-PLAYERDRIVER_OPTION (postgis build_postgis ON)
+IF (HAVE_STL)
+ PLAYERDRIVER_OPTION (postgis build_postgis ON)
+ELSE (HAVE_STL)
+ PLAYERDRIVER_OPTION (postgis build_postgis OFF "STL not found")
+ENDIF (HAVE_STL)
PLAYERDRIVER_REQUIRE_HEADER (postgis build_postgis geos_c.h)
PLAYERDRIVER_REQUIRE_PKG (postgis build_postgis libpqxx
postgis_includeDir postgis_libDir postgis_linkFlags postgis_cFlags)
@@ -7,6 +11,13 @@
LINKFLAGS "-lgeos ${postgis_linkFlags}" CFLAGS "${postgis_cFlags}"
SOURCES postgis.cc dbconn.cc)
-PLAYERDRIVER_OPTION (vec2map build_vec2map ON)
-PLAYERDRIVER_REQUIRE_HEADER (vec2map build_vec2map geos_c.h)
+IF (HAVE_GEOS)
+ IF (HAVE_STL)
+ PLAYERDRIVER_OPTION (vec2map build_vec2map OFF "const problems to be
fixed soon (I hope)")
+ ELSE (HAVE_STL)
+ PLAYERDRIVER_OPTION (vec2map build_vec2map OFF "STL not found")
+ ENDIF (HAVE_STL)
+ELSE (HAVE_GEOS)
+ PLAYERDRIVER_OPTION (vec2map build_vec2map OFF "Geos not found")
+ENDIF (HAVE_GEOS)
PLAYERDRIVER_ADD_DRIVER (vec2map build_vec2map LINKFLAGS "-lgeos" SOURCES
vec2map.cc)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
