Revision: 8816
http://playerstage.svn.sourceforge.net/playerstage/?rev=8816&view=rev
Author: jpgr87
Date: 2010-07-08 02:24:58 +0000 (Thu, 08 Jul 2010)
Log Message:
-----------
Applied patch #3025619: Player SVN trunk: compatibility patch
Modified Paths:
--------------
code/player/trunk/cmake/internal/SearchForStuff.cmake
code/player/trunk/libplayercore/CMakeLists.txt
code/player/trunk/server/drivers/map/vmapfile.cc
code/player/trunk/server/drivers/mixed/epuck/CMakeLists.txt
Modified: code/player/trunk/cmake/internal/SearchForStuff.cmake
===================================================================
--- code/player/trunk/cmake/internal/SearchForStuff.cmake 2010-07-06
18:40:10 UTC (rev 8815)
+++ code/player/trunk/cmake/internal/SearchForStuff.cmake 2010-07-08
02:24:58 UTC (rev 8816)
@@ -113,13 +113,20 @@
SET (HAVE_Z TRUE)
ENDIF (HAVE_LIBZ AND HAVE_ZLIB_H)
-CHECK_LIBRARY_EXISTS (rt clock_gettime "${PLAYER_EXTRA_LIB_DIRS}" HAVE_LIBRT)
-SET (CMAKE_REQUIRED_LIBRARIES rt)
-CHECK_FUNCTION_EXISTS (clock_gettime HAVE_CLOCK_GETTIME_FUNC)
-SET (CMAKE_REQUIRED_LIBRARIES)
-IF (HAVE_LIBRT AND HAVE_CLOCK_GETTIME_FUNC)
- SET (HAVE_CLOCK_GETTIME TRUE)
-ENDIF (HAVE_LIBRT AND HAVE_CLOCK_GETTIME_FUNC)
+IF (PLAYER_OS_QNX)
+ CHECK_FUNCTION_EXISTS (clock_gettime HAVE_CLOCK_GETTIME_FUNC)
+ IF (HAVE_CLOCK_GETTIME_FUNC)
+ SET (HAVE_CLOCK_GETTIME TRUE)
+ ENDIF (HAVE_CLOCK_GETTIME_FUNC)
+ELSE (PLAYER_OS_QNX)
+ CHECK_LIBRARY_EXISTS (rt clock_gettime "${PLAYER_EXTRA_LIB_DIRS}"
HAVE_LIBRT)
+ SET (CMAKE_REQUIRED_LIBRARIES rt)
+ CHECK_FUNCTION_EXISTS (clock_gettime HAVE_CLOCK_GETTIME_FUNC)
+ SET (CMAKE_REQUIRED_LIBRARIES)
+ IF (HAVE_LIBRT AND HAVE_CLOCK_GETTIME_FUNC)
+ SET (HAVE_CLOCK_GETTIME TRUE)
+ ENDIF (HAVE_LIBRT AND HAVE_CLOCK_GETTIME_FUNC)
+ENDIF (PLAYER_OS_QNX)
# Geos check
CHECK_LIBRARY_EXISTS (geos_c GEOSGeomFromWKB_buf "${PLAYER_EXTRA_LIB_DIRS}"
HAVE_GEOS)
Modified: code/player/trunk/libplayercore/CMakeLists.txt
===================================================================
--- code/player/trunk/libplayercore/CMakeLists.txt 2010-07-06 18:40:10 UTC
(rev 8815)
+++ code/player/trunk/libplayercore/CMakeLists.txt 2010-07-08 02:24:58 UTC
(rev 8816)
@@ -31,8 +31,10 @@
ENDIF (NOT PLAYER_OS_QNX)
IF (HAVE_CLOCK_GETTIME)
- PLAYERCORE_ADD_INT_LINK_LIB (rt)
- SET (playercoreLinkLibs ${playercoreLinkLibs} "rt")
+ IF (NOT PLAYER_OS_QNX)
+ PLAYERCORE_ADD_INT_LINK_LIB (rt)
+ SET (playercoreLinkLibs ${playercoreLinkLibs} "rt")
+ ENDIF (NOT PLAYER_OS_QNX)
ELSE (HAVE_CLOCK_GETTIME)
SET (playerreplaceLib playerreplace)
ENDIF (HAVE_CLOCK_GETTIME)
Modified: code/player/trunk/server/drivers/map/vmapfile.cc
===================================================================
--- code/player/trunk/server/drivers/map/vmapfile.cc 2010-07-06 18:40:10 UTC
(rev 8815)
+++ code/player/trunk/server/drivers/map/vmapfile.cc 2010-07-08 02:24:58 UTC
(rev 8816)
@@ -85,6 +85,11 @@
#include <libplayercore/playercore.h>
+#include <config.h>
+#if HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#ifndef FMIN
#define FMIN(a, b) (((a) < (b)) ? (a) : (b))
#endif
Modified: code/player/trunk/server/drivers/mixed/epuck/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/mixed/epuck/CMakeLists.txt 2010-07-06
18:40:10 UTC (rev 8815)
+++ code/player/trunk/server/drivers/mixed/epuck/CMakeLists.txt 2010-07-08
02:24:58 UTC (rev 8816)
@@ -1,5 +1,12 @@
IF (HAVE_STL)
- PLAYERDRIVER_OPTION (epuck build_epuck ON)
+ INCLUDE (CheckCXXSourceCompiles)
+ SET (CHECK_CXX_CODE "#include <sstream>\n#include <stdexcept>\n#include
<vector>\nint main () { try { std::vector<int> myvector;
myvector.resize(myvector.max_size() + 1); } catch (std::length_error & le) {
std::ostringstream out; out<<(le.what())<<std::hex<<std::showbase<<(0x10); }
return 0; }")
+ CHECK_CXX_SOURCE_COMPILES ("${CHECK_CXX_CODE}" HAVE_COMPATIBLE_CXX)
+ IF (HAVE_COMPATIBLE_CXX)
+ PLAYERDRIVER_OPTION (epuck build_epuck ON)
+ ELSE (HAVE_COMPATIBLE_CXX)
+ PLAYERDRIVER_OPTION (epuck build_epuck OFF "Required C++ classes not
found")
+ ENDIF (HAVE_COMPATIBLE_CXX)
ELSE (HAVE_STL)
PLAYERDRIVER_OPTION (epuck build_epuck OFF "STL not found")
ENDIF (HAVE_STL)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
