diff options
Diffstat (limited to 'external')
| -rw-r--r-- | external/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | external/easylogging++/easylogging++.cc | 4 | ||||
| m--------- | external/unbound | 0 |
3 files changed, 2 insertions, 4 deletions
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 358d47a4f..7553f87ea 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -38,9 +38,7 @@ find_package(Miniupnpc REQUIRED) 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") diff --git a/external/easylogging++/easylogging++.cc b/external/easylogging++/easylogging++.cc index b438fa543..a4bdad4cf 100644 --- a/external/easylogging++/easylogging++.cc +++ b/external/easylogging++/easylogging++.cc @@ -1975,11 +1975,11 @@ void VRegistry::setCategories(const char* categories, bool clear) { m_cached_allowed_categories.clear(); m_categoriesString.clear(); } + if (!categories) + return; if (!m_categoriesString.empty()) m_categoriesString += ","; m_categoriesString += categories; - if (!categories) - return; bool isCat = true; bool isLevel = false; diff --git a/external/unbound b/external/unbound -Subproject d3724dfa553429d368c27aef160f02f5e8b8075 +Subproject 7f23967954736dcaa366806b9eaba7e2bdfede1 |