Revision: 7307
http://playerstage.svn.sourceforge.net/playerstage/?rev=7307&view=rev
Author: gbiggs
Date: 2009-01-27 08:59:09 +0000 (Tue, 27 Jan 2009)
Log Message:
-----------
Worked around a missing Check module in CMake 2.4
Modified Paths:
--------------
code/player/trunk/CMakeLists.txt
code/player/trunk/cmake/internal/SearchForStuff.cmake
code/player/trunk/libplayercore/interfaces/062_ranger.def
Modified: code/player/trunk/CMakeLists.txt
===================================================================
--- code/player/trunk/CMakeLists.txt 2009-01-27 04:02:15 UTC (rev 7306)
+++ code/player/trunk/CMakeLists.txt 2009-01-27 08:59:09 UTC (rev 7307)
@@ -1,4 +1,9 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 2.4.7 FATAL_ERROR)
+IF (WIN32)
+ # Require 2.6 for Windows
+ CMAKE_MINIMUM_REQUIRED (VERSION 2.6 FATAL_ERROR)
+ELSE (WIN32)
+ CMAKE_MINIMUM_REQUIRED (VERSION 2.4.7 FATAL_ERROR)
+ENDIF (WIN32)
# Compatibility settings
IF (COMMAND CMAKE_POLICY)
Modified: code/player/trunk/cmake/internal/SearchForStuff.cmake
===================================================================
--- code/player/trunk/cmake/internal/SearchForStuff.cmake 2009-01-27
04:02:15 UTC (rev 7306)
+++ code/player/trunk/cmake/internal/SearchForStuff.cmake 2009-01-27
08:59:09 UTC (rev 7307)
@@ -3,7 +3,6 @@
INCLUDE (CheckFunctionExists)
INCLUDE (CheckIncludeFiles)
INCLUDE (CheckLibraryExists)
-INCLUDE (CheckStructHasMember)
INCLUDE (CheckSymbolExists)
SET (PLAYER_EXTRA_LIB_DIRS "" CACHE STRING "List of extra library
directories.")
@@ -36,10 +35,19 @@
ENDIF (HAVE_XDR)
SET (CMAKE_REQUIRED_LIBRARIES)
+IF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
+ INCLUDE (CheckStructHasMember)
+ CHECK_STRUCT_HAS_MEMBER ("struct timespec" tv_sec time.h
HAVE_STRUCT_TIMESPEC)
+ELSE (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
+ INCLUDE (CheckCSourceCompiles)
+ SET (CHECK_TIMESPEC_SOURCE_CODE "#include <time.h>
+int main () { struct timespec *tmp; return 0; }")
+ CHECK_C_SOURCE_COMPILES ("${CHECK_TIMESPEC_SOURCE_CODE}"
HAVE_STRUCT_TIMESPEC)
+ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
+
CHECK_FUNCTION_EXISTS (gettimeofday HAVE_GETTIMEOFDAY)
CHECK_FUNCTION_EXISTS (usleep HAVE_USLEEP)
CHECK_FUNCTION_EXISTS (nanosleep HAVE_NANOSLEEP)
-CHECK_STRUCT_HAS_MEMBER ("struct timespec" tv_sec time.h HAVE_STRUCT_TIMESPEC)
CHECK_FUNCTION_EXISTS (cfmakeraw HAVE_CFMAKERAW)
CHECK_FUNCTION_EXISTS (dirname HAVE_DIRNAME)
CHECK_INCLUDE_FILES (linux/joystick.h HAVE_LINUX_JOYSTICK_H)
@@ -57,6 +65,7 @@
CHECK_FUNCTION_EXISTS (poll HAVE_POLL)
IF (PLAYER_OS_WIN)
CHECK_SYMBOL_EXISTS (POLLIN winsock2.h HAVE_POLLIN)
+ # This macro will have been pulled in by the previous usage on Windows
CHECK_STRUCT_HAS_MEMBER ("struct pollfd" fd winsock2.h HAVE_POLLFD)
ELSE (PLAYER_OS_WIN)
SET (HAVE_POLLIN ${HAVE_POLL})
Modified: code/player/trunk/libplayercore/interfaces/062_ranger.def
===================================================================
--- code/player/trunk/libplayercore/interfaces/062_ranger.def 2009-01-27
04:02:15 UTC (rev 7306)
+++ code/player/trunk/libplayercore/interfaces/062_ranger.def 2009-01-27
08:59:09 UTC (rev 7307)
@@ -1,7 +1,7 @@
description {
* @brief A range sensor
-Receive data from a range sensor, such as a laser scannar, sonar array or IR
+Receive data from a range sensor, such as a laser scanner, sonar array or IR
array.
@section properties Recommended Properties
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:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
