diff options
| author | rfree2monero <rfreemonero@op.pl> | 2015-04-01 18:24:45 +0200 |
|---|---|---|
| committer | rfree2monero <rfreemonero@op.pl> | 2015-04-01 18:24:45 +0200 |
| commit | 3cbdf198f168e113f12fa49d016133c434964ed7 (patch) | |
| tree | 050c74077de8e1b6e431f7d0671b57b5afcb01ab /CMakeLists.txt | |
| parent | fix locking in count-peers thread (2) (diff) | |
| parent | Merge pull request #248 (diff) | |
| download | monero-3cbdf198f168e113f12fa49d016133c434964ed7.tar.xz | |
Merge remote-tracking branch 'monero-official/master' into network-1.6-work1
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 84a48c116..5c6330162 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -238,12 +238,18 @@ if (${BOOST_IGNORE_SYSTEM_PATHS} STREQUAL "ON") set(Boost_NO_SYSTEM_PATHS TRUE) endif() +set(OLD_LIB_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) if(STATIC) + if(MINGW) + set(CMAKE_FIND_LIBRARY_SUFFIXES .a) + endif() + set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_RUNTIME ON) endif() find_package(Boost 1.53 QUIET REQUIRED COMPONENTS system filesystem thread date_time chrono regex serialization program_options) +set(CMAKE_FIND_LIBRARY_SUFFIXES ${OLD_LIB_SUFFIXES}) if(NOT Boost_FOUND) die("Could not find Boost libraries, please make sure you have installed Boost or libboost-all-dev (1.53 or 1.55+) or the equivalent") endif() |