Menu
▾
▴
[Playerstage-commit] SF.net SVN: playerstage: [6629] code/player/trunk
|
From: <ge...@us...> - 2008-06-17 13:54:07
|
Revision: 6629
http://playerstage.svn.sourceforge.net/playerstage/?rev=6629&view=rev
Author: gerkey
Date: 2008-06-17 13:54:06 -0700 (Tue, 17 Jun 2008)
Log Message:
-----------
turned off RTKGUI by default, fixed amcl to link against rtk if it's included; fixed location of Boost using CMake 2.6
Modified Paths:
--------------
code/player/trunk/client_libs/libplayerc++/CMakeLists.txt
code/player/trunk/cmake/internal/GeneralCompileOptions.cmake
code/player/trunk/server/drivers/localization/amcl/CMakeLists.txt
Modified: code/player/trunk/client_libs/libplayerc++/CMakeLists.txt
===================================================================
--- code/player/trunk/client_libs/libplayerc++/CMakeLists.txt 2008-06-17 20:41:40 UTC (rev 6628)
+++ code/player/trunk/client_libs/libplayerc++/CMakeLists.txt 2008-06-17 20:54:06 UTC (rev 6629)
@@ -5,8 +5,50 @@
IF (BUILD_PLAYERCC)
# Look for Boost libraries
IF (BUILD_PLAYERCC_BOOST)
- IF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)
- # There is a new, much better, FindBoost.cmake in 2.6 (see below)
+ # There is a new, much better, FindBoost.cmake in 2.6
+ IF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
+ OPTION (Boost_USE_STATIC_LIBS "Use the static versions of the Boost libraries" OFF)
+ OPTION (USE_BOOST_THREAD "Use the Boost threading library" ON)
+ MARK_AS_ADVANCED (USE_BOOST_THREAD)
+ OPTION (USE_BOOST_SIGNALS "Use the Boost signalling library" ON)
+ MARK_AS_ADVANCED (USE_BOOST_SIGNALS)
+
+ IF (USE_BOOST_THREAD)
+ SET (BOOST_COMPONENTS thread)
+ ENDIF (USE_BOOST_THREAD)
+ IF (USE_BOOST_SIGNALS)
+ SET (BOOST_COMPONENTS ${BOOST_COMPONENTS} signals)
+ ENDIF (USE_BOOST_SIGNALS)
+ FIND_PACKAGE (Boost COMPONENTS ${BOOST_COMPONENTS})
+ IF (Boost_FOUND)
+ INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIR})
+ LINK_DIRECTORIES (${Boost_LIBRARY_DIRS})
+
+ IF (Boost_THREAD_FOUND)
+ #SET (boostThreadLib -lboost_thread)
+ #PLAYERCC_ADD_LINK_LIB (boost_thread)
+ MESSAGE (STATUS
+ "PlayerC++ client library will be built with Boost::Thread support.")
+ ELSE (Boost_THREAD_FOUND)
+ MESSAGE (STATUS
+ "Boost::Thread library not found, support will not be included.")
+ ENDIF (Boost_THREAD_FOUND)
+
+ IF (Boost_SIGNALS_FOUND)
+ #SET (boostSignalsLib -lboost_signals)
+ #PLAYERCC_ADD_LINK_LIB (boost_signals)
+ MESSAGE (STATUS
+ "PlayerC++ client library will be built with Boost::Signals support.")
+ ELSE (Boost_SIGNALS_FOUND)
+ MESSAGE (STATUS
+ "Boost::Signals library not found, support will not be included.")
+ ENDIF (Boost_SIGNALS_FOUND)
+ ELSE (Boost_FOUND)
+ MESSAGE (STATUS
+ "Boost libraries were not found. Boost::Signals and Boost::Thread support
+ will not be included in PlayerC++.")
+ ENDIF (Boost_FOUND)
+ ELSE (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
FIND_PACKAGE (Boost)
IF (Boost_FOUND)
# For 2.4, assume that if boost is found then both signals and threads are present
@@ -57,49 +99,7 @@
"Boost libraries were not found. Boost::Signals and Boost::Thread support
will not be included in PlayerC++.")
ENDIF (Boost_FOUND)
- ELSE (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)
- OPTION (Boost_USE_STATIC_LIBS "Use the static versions of the Boost libraries" OFF)
- OPTION (USE_BOOST_THREAD "Use the Boost threading library" ON)
- MARK_AS_ADVANCED (USE_BOOST_THREAD)
- OPTION (USE_BOOST_SIGNALS "Use the Boost signalling library" ON)
- MARK_AS_ADVANCED (USE_BOOST_SIGNALS)
-
- IF (USE_BOOST_THREAD)
- SET (BOOST_COMPONENTS thread)
- ENDIF (USE_BOOST_THREAD)
- IF (USE_BOOST_SIGNALS)
- SET (BOOST_COMPONENTS ${BOOST_COMPONENTS} signals)
- ENDIF (USE_BOOST_SIGNALS)
- FIND_PACKAGE (Boost COMPONENTS ${BOOST_COMPONENTS})
- IF (Boost_FOUND)
- INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIR})
- LINK_DIRECTORIES (${Boost_LIBRARY_DIRS})
-
- IF (Boost_THREAD_FOUND)
- SET (boostThreadLib -lboost_thread)
- PLAYERCC_ADD_LINK_LIB (boost_thread)
- MESSAGE (STATUS
- "PlayerC++ client library will be built with Boost::Thread support.")
- ELSE (Boost_THREAD_FOUND)
- MESSAGE (STATUS
- "Boost::Thread library not found, support will not be included.")
- ENDIF (Boost_THREAD_FOUND)
-
- IF (Boost_SIGNALS_FOUND)
- SET (boostSignalsLib -lboost_signals)
- PLAYERCC_ADD_LINK_LIB (boost_signals)
- MESSAGE (STATUS
- "PlayerC++ client library will be built with Boost::Signals support.")
- ELSE (Boost_SIGNALS_FOUND)
- MESSAGE (STATUS
- "Boost::Signals library not found, support will not be included.")
- ENDIF (Boost_SIGNALS_FOUND)
- ELSE (Boost_FOUND)
- MESSAGE (STATUS
- "Boost libraries were not found. Boost::Signals and Boost::Thread support
- will not be included in PlayerC++.")
- ENDIF (Boost_FOUND)
- ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)
+ ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
ELSE (BUILD_PLAYERCC_BOOST)
MESSAGE (STATUS
"Boost support disabled. Boost::Signals and Boost::Thread support will not be
@@ -165,7 +165,7 @@
TARGET_LINK_LIBRARIES (playerc++ playerxdr playerutils playerc ${PLAYERCC_EXTRA_LINK_LIBRARIES})
PLAYER_MAKE_PKGCONFIG ("playerc++"
"C++ wrapper for libplayerc - part of the Player Project"
- "playerxdr playerc" "" "" "-lm ${boostThreadLib} ${boostSignalsLib}")
+ "playerxdr playerc" "" "" "-lm ${Boost_THREAD_LIBRARY} ${Boost_SIGNALS_LIBRARY}")
PLAYER_INSTALL_HEADERS (playerc++ ${playercppconfig_h}
clientproxy.h
Modified: code/player/trunk/cmake/internal/GeneralCompileOptions.cmake
===================================================================
--- code/player/trunk/cmake/internal/GeneralCompileOptions.cmake 2008-06-17 20:41:40 UTC (rev 6628)
+++ code/player/trunk/cmake/internal/GeneralCompileOptions.cmake 2008-06-17 20:54:06 UTC (rev 6629)
@@ -3,7 +3,7 @@
SET (DEBUG_LEVEL NONE CACHE STRING "Level of debug code to be compiled: none, low, medium or high")
IF (WITH_GTK)
- OPTION (INCLUDE_RTKGUI "Include the RTK GUI in the server." ON)
+ OPTION (INCLUDE_RTKGUI "Include the RTK GUI in the server." OFF)
ENDIF (WITH_GTK)
-OPTION (BUILD_SHARED_LIBS "Build the Player libraries as shared libraries." ON)
\ No newline at end of file
+OPTION (BUILD_SHARED_LIBS "Build the Player libraries as shared libraries." ON)
Modified: code/player/trunk/server/drivers/localization/amcl/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/localization/amcl/CMakeLists.txt 2008-06-17 20:41:40 UTC (rev 6628)
+++ code/player/trunk/server/drivers/localization/amcl/CMakeLists.txt 2008-06-17 20:54:06 UTC (rev 6629)
@@ -22,7 +22,7 @@
map/map_draw.c)
IF (INCLUDE_RTKGUI)
- SET (linkFlags "${GTK_LINKFLAGS}")
+ SET (linkFlags "-L${PROJECT_BINARY_DIR}/rtk2 -lrtk ${GTK_LINKFLAGS}")
SET (cFlags "-I${PROJECT_SOURCE_DIR}/rtk2 ${GTK_CFLAGS}")
ELSE (INCLUDE_RTKGUI)
SET (linkFlags)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|