diff options
author | Riccardo Spagni <ric@spagni.net> | 2014-10-06 15:00:06 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2014-10-06 15:00:06 +0200 |
commit | 59172ee125ec916bbd43e97acc18b6aa7354c97a (patch) | |
tree | 5e8cd91476489a01e35199602f347305bdfe08de /CMakeLists.txt | |
parent | Merge branch 'master' of http://github.com/fluffypony/bitmonero (diff) | |
download | monero-59172ee125ec916bbd43e97acc18b6aa7354c97a.tar.xz |
build libunbound from external if no local libunbound or for static builds
Diffstat (limited to '')
-rw-r--r-- | CMakeLists.txt | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e908e0dfe..b9bcc411c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,8 +92,17 @@ if (UNIX AND NOT APPLE) find_package(Threads) endif() -# Find unbound - don't move this to the end, cmake is weird about this -find_package(Unbound REQUIRED) +add_subdirectory(external) + +# Final setup for miniupnpc +if(UPNP_STATIC) + add_definitions("-DUPNP_STATIC") +else() + add_definitions("-DUPNP_DYNAMIC") + include_directories(${UPNP_INCLUDE}) +endif() + +# Final setup for libunbound include_directories(${UNBOUND_INCLUDE}) if(MSVC) @@ -215,15 +224,5 @@ else() add_custom_target(version ALL) endif() -add_subdirectory(external) - -# Final setup for miniupnpc -if(UPNP_STATIC) - add_definitions("-DUPNP_STATIC") -else() - add_definitions("-DUPNP_DYNAMIC") - include_directories(${UPNP_INCLUDE}) -endif() - add_subdirectory(src) add_subdirectory(tests) |