diff options
author | TheCharlatan <seb.kung@gmail.com> | 2018-04-25 18:19:05 +0200 |
---|---|---|
committer | TheCharlatan <seb.kung@gmail.com> | 2018-09-10 22:05:37 +0200 |
commit | cfb3046222ba2bf42732bb9806906a78bc11a49c (patch) | |
tree | 018e4e74f42769886319a66b6d047e3ffbaab1be /contrib/depends/toolchain.cmake.in | |
parent | Unbound is now a submodule. Adapt depends for this. (diff) | |
download | monero-cfb3046222ba2bf42732bb9806906a78bc11a49c.tar.xz |
Add Miniupnp submodule
Drop miniupnp and unbound depends builds. Make sure that build variables are propageted properly to unbound and miniupnp.
Rebase to after the v0.12 release
Diffstat (limited to 'contrib/depends/toolchain.cmake.in')
-rw-r--r-- | contrib/depends/toolchain.cmake.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index f76d7d1ea..6c708f439 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -17,9 +17,9 @@ SET(LIBUNWIND_INCLUDE_DIR @prefix@/include) SET(LIBUNWIND_LIBRARIES @prefix@/lib/libunwind.a) SET(LIBUNWIND_LIBRARY_DIRS @prefix@/lib) -SET(UNBOUND_INCLUDE_DIR @prefix@/include) -SET(UNBOUND_LIBRARIES @prefix@/lib) -SET(UNBOUND_LIBRARY @prefix@/lib/libunbound.a) +#SET(UNBOUND_INCLUDE_DIR @prefix@/include) +#SET(UNBOUND_LIBRARIES @prefix@/lib) +#SET(UNBOUND_LIBRARY @prefix@/lib/libunbound.a) SET(ZMQ_INCLUDE_PATH @prefix@/include) SET(ZMQ_LIB @prefix@/lib/libzmq.a) @@ -28,7 +28,6 @@ SET(BOOST_IGNORE_SYSTEM_PATHS_DEFAULT ON) SET(BOOST_IGNORE_SYSTEM_PATH ON) SET(BOOST_ROOT @prefix@) SET(BOOST_LIBRARYDIR @prefix@/lib) -SET(Boost_COMPILER "-clang") SET(BOOST_IGNORE_SYSTEM_PATHS_DEFAULT OFF) SET(Boost_NO_SYSTEM_PATHS TRUE) SET(Boost_USE_STATIC_LIBS TRUE) |