Revision: 6635
http://playerstage.svn.sourceforge.net/playerstage/?rev=6635&view=rev
Author: gbiggs
Date: 2008-06-17 19:10:29 -0700 (Tue, 17 Jun 2008)
Log Message:
-----------
Turned off boost building by default on OS X under cmake 2.4
Modified Paths:
--------------
code/player/trunk/client_libs/libplayerc++/CMakeLists.txt
Modified: code/player/trunk/client_libs/libplayerc++/CMakeLists.txt
===================================================================
--- code/player/trunk/client_libs/libplayerc++/CMakeLists.txt 2008-06-18
01:29:43 UTC (rev 6634)
+++ code/player/trunk/client_libs/libplayerc++/CMakeLists.txt 2008-06-18
02:10:29 UTC (rev 6635)
@@ -1,7 +1,14 @@
ADD_SUBDIRECTORY (test)
OPTION (BUILD_PLAYERCC "Build the C++ client library" ON)
-OPTION (BUILD_PLAYERCC_BOOST "Include Boost support in the C++ client library"
ON)
+
+IF (PLAYER_OS_OSX AND CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION
EQUAL 4)
+ # Boost is off by default on OS X under CMake 2.4
+ OPTION (BUILD_PLAYERCC_BOOST "Include Boost support in the C++ client
library" OFF)
+ELSE (PLAYER_OS_OSX AND CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION
EQUAL 4)
+ OPTION (BUILD_PLAYERCC_BOOST "Include Boost support in the C++ client
library" ON)
+ENDIF (PLAYER_OS_OSX AND CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION
EQUAL 4)
+
IF (BUILD_PLAYERCC)
# Look for Boost libraries
IF (BUILD_PLAYERCC_BOOST)
@@ -59,16 +66,24 @@
IF (Boost_FOUND)
# For 2.4, assume that if boost is found then both signals and
threads are present
SET (HAVE_BOOST_THREAD TRUE INTERNAL)
+ IF (PLAYER_OS_OSX)
+ OPTION (Boost_USE_MULTITHREAD "Use the multithreaded
versions of the Boost libraries" ON)
+ ELSE (PLAYER_OS_OSX)
+ OPTION (Boost_USE_MULTITHREAD "Use the multithreaded
versions of the Boost libraries" OFF)
+ ENDIF (PLAYER_OS_OSX)
+ IF (Boost_USE_MULTITHREAD)
+ SET (boostLibSuffix -mt)
+ ENDIF (Boost_USE_MULTITHREAD)
IF (HAVE_BOOST_THREAD)
OPTION (USE_BOOST_THREAD "Use the Boost threading library"
ON)
MARK_AS_ADVANCED (USE_BOOST_THREAD)
IF (USE_BOOST_THREAD)
MESSAGE (STATUS
"PlayerC++ client library will be built with
Boost::Thread support.")
- PLAYERCC_ADD_LINK_LIB (boost_thread)
+ SET (boostThreadLib boost_thread${boostLibSuffix})
+ PLAYERCC_ADD_LINK_LIB (${boostThreadLib})
INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS})
LINK_DIRECTORIES (${Boost_LIBRARY_DIRS})
- SET (boostThreadLib boost_thread)
SET (boostIncludeDir ${Boost_INCLUDE_DIRS})
ELSE (USE_BOOST_THREAD)
MESSAGE (STATUS
@@ -87,10 +102,10 @@
IF (USE_BOOST_SIGNALS)
MESSAGE (STATUS
"PlayerC++ client library will be built with
Boost::Signals support.")
- PLAYERCC_ADD_LINK_LIB (boost_signals)
+ SET (boostSignalsLib boost_signals${boostLibSuffix})
+ PLAYERCC_ADD_LINK_LIB (${boostSignalsLib})
INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS})
LINK_DIRECTORIES (${Boost_LIBRARY_DIRS})
- SET (boostSignalsLib boost_signals)
SET (boostIncludeDir ${Boost_INCLUDE_DIRS})
ELSE (USE_BOOST_SIGNALS)
MESSAGE (STATUS
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
