Revision: 6634
http://playerstage.svn.sourceforge.net/playerstage/?rev=6634&view=rev
Author: gbiggs
Date: 2008-06-17 18:29:43 -0700 (Tue, 17 Jun 2008)
Log Message:
-----------
Fixed boost checks under cmake 2.4, made more flexible under 2.6
Modified Paths:
--------------
code/player/trunk/client_libs/libplayerc++/CMakeLists.txt
code/player/trunk/cmake/pkgconfig.cmake
Modified: code/player/trunk/client_libs/libplayerc++/CMakeLists.txt
===================================================================
--- code/player/trunk/client_libs/libplayerc++/CMakeLists.txt 2008-06-17
23:03:49 UTC (rev 6633)
+++ code/player/trunk/client_libs/libplayerc++/CMakeLists.txt 2008-06-18
01:29:43 UTC (rev 6634)
@@ -8,6 +8,7 @@
# 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)
+ MARK_AS_ADVANCED (Boost_USE_STATIC_LIBS)
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)
@@ -25,8 +26,11 @@
LINK_DIRECTORIES (${Boost_LIBRARY_DIRS})
IF (Boost_THREAD_FOUND)
- #SET (boostThreadLib -lboost_thread)
- #PLAYERCC_ADD_LINK_LIB (boost_thread)
+ GET_FILENAME_COMPONENT (boostThreadLib
${Boost_THREAD_LIBRARY} NAME_WE CACHE)
+ # Chop off the lib at the front, too, if present
+ STRING (REGEX REPLACE "^lib" "" boostThreadLib
${boostThreadLib})
+ PLAYERCC_ADD_LINK_LIB (${boostThreadLib})
+ SET (boostIncludeDir ${Boost_INCLUDE_DIR})
MESSAGE (STATUS
"PlayerC++ client library will be built with
Boost::Thread support.")
ELSE (Boost_THREAD_FOUND)
@@ -35,8 +39,10 @@
ENDIF (Boost_THREAD_FOUND)
IF (Boost_SIGNALS_FOUND)
- #SET (boostSignalsLib -lboost_signals)
- #PLAYERCC_ADD_LINK_LIB (boost_signals)
+ GET_FILENAME_COMPONENT (boostSignalsLib
${Boost_SIGNALS_LIBRARY} NAME_WE CACHE)
+ STRING (REGEX REPLACE "^lib" "" boostSignalsLib
${boostSignalsLib})
+ PLAYERCC_ADD_LINK_LIB (${boostSignalsLib})
+ SET (boostIncludeDir ${Boost_INCLUDE_DIR})
MESSAGE (STATUS
"PlayerC++ client library will be built with
Boost::Signals support.")
ELSE (Boost_SIGNALS_FOUND)
@@ -62,7 +68,8 @@
PLAYERCC_ADD_LINK_LIB (boost_thread)
INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS})
LINK_DIRECTORIES (${Boost_LIBRARY_DIRS})
- SET (boostThreadLib -lboost_thread)
+ SET (boostThreadLib boost_thread)
+ SET (boostIncludeDir ${Boost_INCLUDE_DIRS})
ELSE (USE_BOOST_THREAD)
MESSAGE (STATUS
"PlayerC++ client library Boost::Thread support
disabled by user.")
@@ -83,7 +90,8 @@
PLAYERCC_ADD_LINK_LIB (boost_signals)
INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS})
LINK_DIRECTORIES (${Boost_LIBRARY_DIRS})
- SET (boostSignalsLib -lboost_signals)
+ SET (boostSignalsLib boost_signals)
+ SET (boostIncludeDir ${Boost_INCLUDE_DIRS})
ELSE (USE_BOOST_SIGNALS)
MESSAGE (STATUS
"PlayerC++ client library Boost::Signals
support disabled by
@@ -165,7 +173,8 @@
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
${Boost_THREAD_LIBRARY} ${Boost_SIGNALS_LIBRARY}")
+ "playerxdr playerc" "" "-I${boostIncludeDir}"
+ "-lm -L${Boost_LIBRARY_DIRS} -l${boostThreadLib}
-l${boostSignalsLib}")
PLAYER_INSTALL_HEADERS (playerc++ ${playercppconfig_h}
clientproxy.h
Modified: code/player/trunk/cmake/pkgconfig.cmake
===================================================================
--- code/player/trunk/cmake/pkgconfig.cmake 2008-06-17 23:03:49 UTC (rev
6633)
+++ code/player/trunk/cmake/pkgconfig.cmake 2008-06-18 01:29:43 UTC (rev
6634)
@@ -8,5 +8,5 @@
Description: @PKG_DESC@
Version: @PLAYER_VERSION@
Requires: @PKG_EXTERNAL_DEPS@
-Libs: -L${libdir} @PKG_LIBFLAGS@ [EMAIL PROTECTED]@ @PKG_INTERNAL_DEPS@
+Libs: -L${libdir} [EMAIL PROTECTED]@ @PKG_LIBFLAGS@ @PKG_INTERNAL_DEPS@
Cflags: -I${includedir}/[EMAIL PROTECTED]@[EMAIL PROTECTED]@ @PKG_CFLAGS@
\ No newline at end of file
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
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
