diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-03-24 08:50:08 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-03-24 08:53:05 +0200 |
| commit | d7286395c97afd9d33d6170c1cf24f1e38140b37 (patch) | |
| tree | 5513e1477d68755a44e0b0c7d34542b1c75eb99d /CMakeLists.txt | |
| parent | updated gtest to latest (diff) | |
| parent | Merge upstream to daemonize changes (diff) | |
| download | monero-d7286395c97afd9d33d6170c1cf24f1e38140b37.tar.xz | |
Merge pull request #243
51e3579 Fixed bug in static linking boost on MINGW (Thomas Winget)
f78bb00 Hopefully fixes build on Windows for real this time (Thomas Winget)
2b0583b Hopefully fixes build on Windows (Thomas Winget)
9dab105 DNS checkpoint loading for testnet should now be correct (Thomas Winget)
52f9629 sending commands to forked daemon works on testnet now (Thomas Winget)
76289d0 Fix tests building -- function signatures changed (Thomas Winget)
db53e19 revert stop_daemon method to use correct exit (Thomas Winget)
96cbecf RPC calls for background daemon added in (Thomas Winget)
9193d6f Daemonize changes pulled in -- daemon builds (Thomas Winget)
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 4c1209e08..8af4ef69e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -238,12 +238,18 @@ if (BOOST_IGNORE_SYSTEM_PATHS) 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() |