|
 |
3462a20 |
diff -up ./client_libs/libplayerc++/CMakeLists.txt.cmake3 ./client_libs/libplayerc++/CMakeLists.txt
|
|
|
3462a20 |
--- ./client_libs/libplayerc++/CMakeLists.txt.cmake3 2017-04-08 13:05:52.000000000 -0400
|
|
|
3462a20 |
+++ ./client_libs/libplayerc++/CMakeLists.txt 2017-04-09 13:45:57.521862361 -0400
|
|
|
3462a20 |
@@ -24,7 +24,7 @@ IF (BUILD_PLAYERCC)
|
|
|
3462a20 |
# Look for Boost libraries
|
|
|
3462a20 |
IF (BUILD_PLAYERCC_BOOST)
|
|
|
3462a20 |
# There is a new, much better, FindBoost.cmake in 2.6
|
|
|
3462a20 |
- IF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 5)
|
|
|
3462a20 |
+ IF (CMAKE_MAJOR_VERSION GREATER 2 OR (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 5))
|
|
|
3462a20 |
OPTION (Boost_USE_STATIC_LIBS "Use the static versions of the Boost libraries" OFF)
|
|
|
3462a20 |
MARK_AS_ADVANCED (Boost_USE_STATIC_LIBS)
|
|
|
3462a20 |
OPTION (USE_BOOST_THREAD "Use the Boost threading library" ON)
|
|
|
3462a20 |
@@ -38,7 +38,7 @@ IF (BUILD_PLAYERCC)
|
|
|
3462a20 |
SET (HAVE_BOOST_THREAD FALSE CACHE INTERNAL "Is the Boost::Thread library present")
|
|
|
3462a20 |
ENDIF (USE_BOOST_THREAD)
|
|
|
3462a20 |
IF (USE_BOOST_SIGNALS)
|
|
|
3462a20 |
- SET (BOOST_COMPONENTS ${BOOST_COMPONENTS} signals2)
|
|
|
3462a20 |
+ SET (BOOST_COMPONENTS ${BOOST_COMPONENTS} signals)
|
|
|
3462a20 |
ELSE (USE_BOOST_SIGNALS)
|
|
|
3462a20 |
SET (HAVE_BOOST_SIGNALS FALSE CACHE INTERNAL "Is the Boost::Signals library present")
|
|
|
3462a20 |
ENDIF (USE_BOOST_SIGNALS)
|
|
|
3462a20 |
@@ -88,7 +88,7 @@ IF (BUILD_PLAYERCC)
|
|
|
3462a20 |
"Boost libraries were not found. Boost::Signals and Boost::Thread support
|
|
|
3462a20 |
will not be included in PlayerC++.")
|
|
|
3462a20 |
ENDIF (Boost_FOUND)
|
|
|
3462a20 |
- ELSE (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 5)
|
|
|
3462a20 |
+ ELSE (CMAKE_MAJOR_VERSION GREATER 2 OR (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 5))
|
|
|
3462a20 |
FIND_PACKAGE (Boost)
|
|
|
3462a20 |
IF (Boost_FOUND)
|
|
|
3462a20 |
# For 2.4, assume that if boost is found then both signals and threads are present
|
|
|
3462a20 |
@@ -160,7 +160,7 @@ IF (BUILD_PLAYERCC)
|
|
|
3462a20 |
"Boost libraries were not found. Boost::Signals and Boost::Thread support
|
|
|
3462a20 |
will not be included in PlayerC++.")
|
|
|
3462a20 |
ENDIF (Boost_FOUND)
|
|
|
3462a20 |
- ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 5)
|
|
|
3462a20 |
+ ENDIF (CMAKE_MAJOR_VERSION GREATER 2 OR (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 5))
|
|
|
3462a20 |
ELSE (BUILD_PLAYERCC_BOOST)
|
|
|
3462a20 |
MESSAGE (STATUS
|
|
|
3462a20 |
"Boost support disabled. Boost::Signals and Boost::Thread support will not be
|