Revision: 9046
          http://playerstage.svn.sourceforge.net/playerstage/?rev=9046&view=rev
Author:   jpgr87
Date:     2011-05-22 23:45:19 +0000 (Sun, 22 May 2011)

Log Message:
-----------
Applied patch #3305455: postgis and postlog building problems with latest 
postgresql

Modified Paths:
--------------
    code/player/trunk/server/drivers/shell/CMakeLists.txt
    code/player/trunk/server/drivers/vectormap/CMakeLists.txt

Modified: code/player/trunk/server/drivers/shell/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/shell/CMakeLists.txt       2011-05-12 
21:40:26 UTC (rev 9045)
+++ code/player/trunk/server/drivers/shell/CMakeLists.txt       2011-05-22 
23:45:19 UTC (rev 9046)
@@ -36,11 +36,7 @@
 PLAYERDRIVER_OPTION (postlog build_postlog ON)
 PLAYERDRIVER_REQUIRE_PKG (postlog build_postlog libpqxx
     postlog_includeDirs postlog_libDirs postlog_linkLibs postlog_linkFlags 
postlog_cFlags)
-IF (PLAYER_OS_SOLARIS)
-    SET (postlogLinkFlag "-lpq")
-ELSE (PLAYER_OS_SOLARIS)
-    SET (postlogLinkFlag)
-ENDIF (PLAYER_OS_SOLARIS)
+SET (postlogLinkFlag "-lpq")
 PLAYERDRIVER_ADD_DRIVER (postlog build_postlog
     INCLUDEDIRS ${postlog_includeDirs} LIBDIRS ${postlog_libDirs}
     LINKLIBS ${postlog_linkLibs} LINKFLAGS ${postlog_linkFlags} 
${postlogLinkFlag}

Modified: code/player/trunk/server/drivers/vectormap/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/vectormap/CMakeLists.txt   2011-05-12 
21:40:26 UTC (rev 9045)
+++ code/player/trunk/server/drivers/vectormap/CMakeLists.txt   2011-05-22 
23:45:19 UTC (rev 9046)
@@ -5,11 +5,7 @@
 ENDIF (HAVE_STL)
 PLAYERDRIVER_REQUIRE_PKG (postgis build_postgis libpqxx
     postgis_includeDirs postgis_libDirs postgis_linkLibs postgis_linkFlags 
postgis_cFlags)
-IF (PLAYER_OS_SOLARIS)
-    SET (pqLinkFlag "-lpq")
-ELSE (PLAYER_OS_SOLARIS)
-    SET (pqLinkFlag)
-ENDIF (PLAYER_OS_SOLARIS)
+SET (pqLinkFlag "-lpq")
 PLAYERDRIVER_ADD_DRIVER (postgis build_postgis
     INCLUDEDIRS ${postgis_includeDirs} LIBDIRS ${postgis_libDirs}
     LINKLIBS ${postgis_linkLibs} LINKFLAGS ${postgis_linkFlags} ${pqLinkFlag}


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its 
next-generation tools to help Windows* and Linux* C/C++ and Fortran 
developers boost performance applications - including clusters. 
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit

Reply via email to