diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-01-03 20:02:44 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-01-03 20:02:44 +0200 |
| commit | 58dbc9d122b5274c8a67f0dc035efbb3943f7e5f (patch) | |
| tree | d48ef6831c2e40f0ea09734ed7862c7f5620aa7b /external | |
| parent | Merge pull request #595 (diff) | |
| parent | ARMv7 optimization flags are too aggressive (diff) | |
| download | monero-58dbc9d122b5274c8a67f0dc035efbb3943f7e5f.tar.xz | |
fixed conflicts
Diffstat (limited to 'external')
| -rw-r--r-- | external/miniupnpc/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | external/unbound/config.h.cmake.in | 7 |
2 files changed, 6 insertions, 15 deletions
diff --git a/external/miniupnpc/CMakeLists.txt b/external/miniupnpc/CMakeLists.txt index 40aa0c832..1e7645a9d 100644 --- a/external/miniupnpc/CMakeLists.txt +++ b/external/miniupnpc/CMakeLists.txt @@ -4,8 +4,8 @@ project (miniupnpc C) set (MINIUPNPC_VERSION 1.9) set (MINIUPNPC_API_VERSION 15) -if (0) -#[[ - we comment out this block as we don't support these other build types +# - we comment out this block as we don't support these other build types +if(0) if (NOT CMAKE_BUILD_TYPE) if (WIN32) set (DEFAULT_BUILD_TYPE MinSizeRel) @@ -16,8 +16,7 @@ if (NOT CMAKE_BUILD_TYPE) "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE) endif() -#]] -endif (0) +endif() option (UPNPC_BUILD_STATIC "Build static library" TRUE) option (UPNPC_BUILD_SHARED "Build shared library" FALSE) @@ -43,8 +42,8 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") add_definitions (-D_DARWIN_C_SOURCE) endif () -if (0) -#[[ - we comment out this block as we already set flags +# - we comment out this block as we already set flags +if(0) # Set compiler specific build flags if (CMAKE_COMPILER_IS_GNUC) # Set our own default flags at first run. @@ -67,8 +66,7 @@ if (CMAKE_COMPILER_IS_GNUC) endif (NOT CONFIGURED) endif () -#]] -endif (0) +endif() configure_file (miniupnpcstrings.h.cmake ${CMAKE_BINARY_DIR}/miniupnpcstrings.h) include_directories (${CMAKE_BINARY_DIR}) diff --git a/external/unbound/config.h.cmake.in b/external/unbound/config.h.cmake.in index 861020ecd..9658c8693 100644 --- a/external/unbound/config.h.cmake.in +++ b/external/unbound/config.h.cmake.in @@ -768,13 +768,6 @@ #define _LARGEFILE_SOURCE 1 #endif - - - -#ifndef UNBOUND_DEBUG -# define NDEBUG -#endif - /** Use small-ldns codebase */ #define USE_SLDNS 1 #ifdef HAVE_SSL |