Revision: 6590
http://playerstage.svn.sourceforge.net/playerstage/?rev=6590&view=rev
Author: gerkey
Date: 2008-06-16 14:19:54 -0700 (Mon, 16 Jun 2008)
Log Message:
-----------
fixed replacement of clock_gettime on OS X
Modified Paths:
--------------
code/player/trunk/libplayercore/CMakeLists.txt
code/player/trunk/replace/clock_gettime.c
Modified: code/player/trunk/libplayercore/CMakeLists.txt
===================================================================
--- code/player/trunk/libplayercore/CMakeLists.txt 2008-06-16 20:04:26 UTC
(rev 6589)
+++ code/player/trunk/libplayercore/CMakeLists.txt 2008-06-16 21:19:54 UTC
(rev 6590)
@@ -46,26 +46,44 @@
# Include from the binary dir to get player_interfaces.h and interface_table.h
INCLUDE_DIRECTORIES (${CMAKE_CURRENT_BINARY_DIR})
-SET (playercore_srcs driver.cc
- device.cc
- drivertable.cc
- devicetable.cc
- configfile.cc
- message.cc
- wallclocktime.cc
- plugins.cc
- globals.cc
- property.cpp)
-PLAYER_ADD_LIBRARY (playercore ${playercore_srcs} ${player_interfaces_h}
${playerxdr_h})
# TODO: playerxdr should NOT be linked here; it's a bogus dependency coming
# from the fact that message cloning functions are auto-generated into
# playerxdr and used here. Those functions should go into a separate
# library.
-TARGET_LINK_LIBRARIES (playercore playerutils playererror playerxdr ltdl dl
pthread rt)
-PLAYER_ADD_LINK_LIB (ltdl dl pthread rt)
-PLAYER_MAKE_PKGCONFIG ("playercore" "Player core library - part of the Player
Project" "playererror" "" "" "-lltdl -lpthread -lrt")
+SET(CORESRCS driver.cc
+ device.cc
+ drivertable.cc
+ devicetable.cc
+ configfile.cc
+ message.cc
+ wallclocktime.cc
+ plugins.cc
+ globals.cc
+ property.cpp)
+SET(CORELIBS playerutils playererror playerxdr pthread)
+SET(CORE_PC_LIBS "-lpthread")
+PLAYER_ADD_LINK_LIB (pthread)
+IF(HAVE_CLOCK_GETTIME)
+ SET(CORELIBS ${CORELIBS} rt)
+ SET(CORE_PC_LIBS "${CORE_PC_LIBS} -lrt")
+ PLAYER_ADD_LINK_LIB (rt)
+ELSE(HAVE_CLOCK_GETTIME)
+ SET(CORESRCS ${CORESRCS} ../replace/clock_gettime.c)
+ENDIF(HAVE_CLOCK_GETTIME)
+IF(HAVE_LIBLTDL)
+ SET(CORELIBS ${CORELIBS} ltdl dl)
+ SET(CORE_PC_LIBS "${CORE_PC_LIBS} -lltdl -dl")
+ PLAYER_ADD_LINK_LIB (ltdl dl)
+ENDIF(HAVE_LIBLTDL)
+SET (playercore_srcs ${CORESRCS})
+PLAYER_ADD_LIBRARY (playercore ${playercore_srcs} ${player_interfaces_h}
${playerxdr_h})
+
+TARGET_LINK_LIBRARIES(playercore ${CORELIBS})
+PLAYER_MAKE_PKGCONFIG ("playercore" "Player core library - part of the Player
Project" "playererror" "" "" "${CORE_PC_LIBS}")
+
+
SET (playererror_srcs error.c)
PLAYER_ADD_LIBRARY (playererror ${playererror_srcs})
PLAYER_MAKE_PKGCONFIG ("playererror" "Player error reporting library - part of
the Player Project" "" "" "" "")
Modified: code/player/trunk/replace/clock_gettime.c
===================================================================
--- code/player/trunk/replace/clock_gettime.c 2008-06-16 20:04:26 UTC (rev
6589)
+++ code/player/trunk/replace/clock_gettime.c 2008-06-16 21:19:54 UTC (rev
6590)
@@ -22,7 +22,6 @@
#include <playerconfig.h>
-#if defined (HAVE_CLOCK_GETTIME)
#include <sys/time.h>
@@ -43,4 +42,3 @@
return 0;
}
-#endif // defined (HAVE_CLOCK_GETTIME)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
