Merge pull request #7 from HackFisher/phoenix
Fix multi find_package change ${Boost_LIBRARIE}
This commit is contained in:
commit
259204df22
1 changed files with 2 additions and 0 deletions
|
|
@ -44,7 +44,9 @@ IF( WIN32 )
|
|||
FIND_PACKAGE(Boost 1.53 REQUIRED COMPONENTS thread date_time system filesystem program_options signals serialization chrono unit_test_framework context)
|
||||
# For Boost 1.53 on windows, coroutine was not in BOOST_LIBRARYDIR and do not need it to build, but if boost versin >= 1.54, find coroutine otherwise will cause link errors
|
||||
IF(NOT "${Boost_VERSION}" MATCHES "1.53(.*)")
|
||||
SET(BOOST_LIBRARIES_TEMP ${Boost_LIBRARIES})
|
||||
FIND_PACKAGE(Boost 1.54 REQUIRED COMPONENTS coroutine)
|
||||
SET(Boost_LIBRARIES ${BOOST_LIBRARIES_TEMP} ${Boost_LIBRARIES})
|
||||
ENDIF()
|
||||
|
||||
ELSE(WIN32)
|
||||
|
|
|
|||
Loading…
Reference in a new issue