|
 |
0c9dcfc |
diff -up ./player-3.0.2/client_libs/libplayerc++/CMakeLists.txt.boost150 ./player-3.0.2/client_libs/libplayerc++/CMakeLists.txt
|
|
|
0c9dcfc |
--- ./player-3.0.2/client_libs/libplayerc++/CMakeLists.txt.boost150 2009-08-03 23:48:04.000000000 -0400
|
|
|
0c9dcfc |
+++ ./player-3.0.2/client_libs/libplayerc++/CMakeLists.txt 2012-08-12 18:42:46.656436126 -0400
|
|
|
0c9dcfc |
@@ -24,7 +24,7 @@ IF (BUILD_PLAYERCC)
|
|
|
0c9dcfc |
# Look for Boost libraries
|
|
|
0c9dcfc |
IF (BUILD_PLAYERCC_BOOST)
|
|
|
0c9dcfc |
# There is a new, much better, FindBoost.cmake in 2.6
|
|
|
0c9dcfc |
- IF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
|
|
|
0c9dcfc |
+ IF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 5)
|
|
|
0c9dcfc |
OPTION (Boost_USE_STATIC_LIBS "Use the static versions of the Boost libraries" OFF)
|
|
|
0c9dcfc |
MARK_AS_ADVANCED (Boost_USE_STATIC_LIBS)
|
|
|
0c9dcfc |
OPTION (USE_BOOST_THREAD "Use the Boost threading library" ON)
|
|
|
0c9dcfc |
@@ -33,7 +33,7 @@ IF (BUILD_PLAYERCC)
|
|
|
0c9dcfc |
MARK_AS_ADVANCED (USE_BOOST_SIGNALS)
|
|
|
0c9dcfc |
|
|
|
0c9dcfc |
IF (USE_BOOST_THREAD)
|
|
|
0c9dcfc |
- SET (BOOST_COMPONENTS thread)
|
|
|
0c9dcfc |
+ SET (BOOST_COMPONENTS thread system)
|
|
|
0c9dcfc |
ELSE (USE_BOOST_THREAD)
|
|
|
0c9dcfc |
SET (HAVE_BOOST_THREAD FALSE CACHE INTERNAL "Is the Boost::Thread library present")
|
|
|
0c9dcfc |
ENDIF (USE_BOOST_THREAD)
|
|
|
0c9dcfc |
@@ -61,6 +61,21 @@ IF (BUILD_PLAYERCC)
|
|
|
0c9dcfc |
"Boost::Thread library not found, support will not be included.")
|
|
|
0c9dcfc |
ENDIF (Boost_THREAD_FOUND)
|
|
|
0c9dcfc |
|
|
|
0c9dcfc |
+ IF (Boost_SYSTEM_FOUND)
|
|
|
0c9dcfc |
+ GET_FILENAME_COMPONENT (boostSystemLib ${Boost_SYSTEM_LIBRARY} NAME_WE CACHE)
|
|
|
0c9dcfc |
+ # Chop off the lib at the front, too, if present
|
|
|
0c9dcfc |
+ STRING (REGEX REPLACE "^lib" "" boostSystemLib ${boostSystemLib})
|
|
|
0c9dcfc |
+ PLAYERCC_ADD_LINK_LIB (${boostSystemLib})
|
|
|
0c9dcfc |
+ SET (boostIncludeDir ${Boost_INCLUDE_DIR})
|
|
|
0c9dcfc |
+ SET (HAVE_BOOST_SYSTEM TRUE CACHE INTERNAL "Is the Boost::System library present")
|
|
|
0c9dcfc |
+ MESSAGE (STATUS
|
|
|
0c9dcfc |
+ "PlayerC++ client library will be built with Boost::System support.")
|
|
|
0c9dcfc |
+ ELSE (Boost_SYSTEM_FOUND)
|
|
|
0c9dcfc |
+ MESSAGE (STATUS
|
|
|
0c9dcfc |
+ "Boost::System library not found, support will not be included.")
|
|
|
0c9dcfc |
+ ENDIF (Boost_SYSTEM_FOUND)
|
|
|
0c9dcfc |
+
|
|
|
0c9dcfc |
+
|
|
|
0c9dcfc |
IF (Boost_SIGNALS_FOUND)
|
|
|
0c9dcfc |
GET_FILENAME_COMPONENT (boostSignalsLib ${Boost_SIGNALS_LIBRARY} NAME_WE CACHE)
|
|
|
0c9dcfc |
STRING (REGEX REPLACE "^lib" "" boostSignalsLib ${boostSignalsLib})
|
|
|
0c9dcfc |
@@ -78,7 +93,7 @@ IF (BUILD_PLAYERCC)
|
|
|
0c9dcfc |
"Boost libraries were not found. Boost::Signals and Boost::Thread support
|
|
|
0c9dcfc |
will not be included in PlayerC++.")
|
|
|
0c9dcfc |
ENDIF (Boost_FOUND)
|
|
|
0c9dcfc |
- ELSE (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
|
|
|
0c9dcfc |
+ ELSE (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 5)
|
|
|
0c9dcfc |
FIND_PACKAGE (Boost)
|
|
|
0c9dcfc |
IF (Boost_FOUND)
|
|
|
0c9dcfc |
# For 2.4, assume that if boost is found then both signals and threads are present
|
|
|
0c9dcfc |
@@ -146,7 +161,7 @@ IF (BUILD_PLAYERCC)
|
|
|
0c9dcfc |
"Boost libraries were not found. Boost::Signals and Boost::Thread support
|
|
|
0c9dcfc |
will not be included in PlayerC++.")
|
|
|
0c9dcfc |
ENDIF (Boost_FOUND)
|
|
|
0c9dcfc |
- ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
|
|
|
0c9dcfc |
+ ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 5)
|
|
|
0c9dcfc |
ELSE (BUILD_PLAYERCC_BOOST)
|
|
|
0c9dcfc |
MESSAGE (STATUS
|
|
|
0c9dcfc |
"Boost support disabled. Boost::Signals and Boost::Thread support will not be
|