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 /external | |
| 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 'external')
| -rw-r--r-- | external/CMakeLists.txt | 44 |
1 files changed, 13 insertions, 31 deletions
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 4757b2a3b..25021fe9e 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -37,18 +37,12 @@ find_package(Miniupnpc REQUIRED) -if(DEPENDS) - message(STATUS "Using static depends miniupnpc found at ${MINIUPNP_LIBRARIES}") - set(UPNP_STATIC true PARENT_SCOPE) - set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE) -else() - message(STATUS "Using in-tree miniupnpc") - add_subdirectory(miniupnp/miniupnpc) - set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") -endif() +message(STATUS "Using in-tree miniupnpc") +add_subdirectory(miniupnp/miniupnpc) +set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") if(MSVC) set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") -elseif(NOT MSVC AND NOT DEPENDS) +elseif(NOT MSVC) set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") endif() @@ -56,7 +50,7 @@ set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) find_package(Unbound) -if(NOT UNBOUND_INCLUDE_DIR OR STATIC AND NOT DEPENDS) +if(NOT UNBOUND_INCLUDE_DIR OR STATIC) # NOTE: If STATIC is true, CMAKE_FIND_LIBRARY_SUFFIXES has been reordered. # unbound has config tests which used OpenSSL libraries, so -ldl may need to # be set in this case. @@ -69,27 +63,15 @@ if(NOT UNBOUND_INCLUDE_DIR OR STATIC AND NOT DEPENDS) set(UNBOUND_LIBRARY "unbound" PARENT_SCOPE) set(UNBOUND_LIBRARY_DIRS "${LIBEVENT2_LIBDIR}" PARENT_SCOPE) else() - if(DEPENDS) - message(STATUS "Found libunbound include (unbound.h) in ${UNBOUND_INCLUDE_DIR}") - if(UNBOUND_LIBRARIES) - message(STATUS "Found libunbound library in ${UNBOUND_LIBRARIES}") - set(UNBOUND_STATIC true PARENT_SCOPE) - set(UNBOUND_LIBRARY ${UNBOUND_LIBRARIES} PARENTSCOPE) - set(UNBOUND_LIBRARY_DIRS "" PARENT_SCOPE) - else() - die("Found libunbound includes, but could not find libunbound library. Please make sure you have installed libunbound or libunbound-dev or the equivalent") - endif() + message(STATUS "Found libunbound include (unbound.h) in ${UNBOUND_INCLUDE_DIR}") + if(UNBOUND_LIBRARIES) + message(STATUS "Found libunbound shared library") + set(UNBOUND_STATIC false PARENT_SCOPE) + set(UNBOUND_INCLUDE ${UNBOUND_INCLUDE_DIR} PARENT_SCOPE) + set(UNBOUND_LIBRARY ${UNBOUND_LIBRARIES} PARENT_SCOPE) + set(UNBOUND_LIBRARY_DIRS "" PARENT_SCOPE) else() - message(STATUS "Found libunbound include (unbound.h) in ${UNBOUND_INCLUDE_DIR}") - if(UNBOUND_LIBRARIES) - message(STATUS "Found libunbound shared library") - set(UNBOUND_STATIC false PARENT_SCOPE) - set(UNBOUND_INCLUDE ${UNBOUND_INCLUDE_DIR} PARENT_SCOPE) - set(UNBOUND_LIBRARY ${UNBOUND_LIBRARIES} PARENT_SCOPE) - set(UNBOUND_LIBRARY_DIRS "" PARENT_SCOPE) - else() - die("Found libunbound includes, but could not find libunbound library. Please make sure you have installed libunbound or libunbound-dev or the equivalent") - endif() + die("Found libunbound includes, but could not find libunbound library. Please make sure you have installed libunbound or libunbound-dev or the equivalent") endif() endif() |