Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updates from BitShares FC #22

Closed
nathanielhourt wants to merge 693 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 693 Files changed 313 +2 -2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 86b025007a - Show all commits

4
CMakeModules/Boost/BoostConfig.cmake
View file

@ -1,9 +1,9 @@
# This overrides `find_package(Boost ... CONFIG ... )` calls # This overrides `find_package(Boost ... CONFIG ... )` calls
# - calls the CMAke's built-in `FindBoost.cmake` and adds `pthread` library dependency # - calls the CMake's built-in `FindBoost.cmake` and adds `pthread` library dependency
MESSAGE(STATUS "Using custom FindBoost config") MESSAGE(STATUS "Using custom FindBoost config")
find_package(Boost 1.57 REQUIRED COMPONENTS ${Boost_FIND_COMPONENTS}) find_package(Boost 1.58 REQUIRED COMPONENTS ${Boost_FIND_COMPONENTS})
# Inject `pthread` dependency to Boost if needed # Inject `pthread` dependency to Boost if needed
if (UNIX AND NOT CYGWIN) if (UNIX AND NOT CYGWIN)