diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-09-24 13:50:35 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-09-24 13:50:35 -0500 |
| commit | faf5805fc06845d2351227fc37d4e5705ceb60a9 (patch) | |
| tree | 11fda70ab895cea2bda7e25bc6f7557f18a30fee | |
| parent | Merge pull request #5909 (diff) | |
| parent | easylogging++: ensure it finds boost headers (diff) | |
| download | monero-faf5805fc06845d2351227fc37d4e5705ceb60a9.tar.xz | |
Merge pull request #5928
9a95827 easylogging++: ensure it finds boost headers (moneromooo-monero)
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | external/easylogging++/CMakeLists.txt | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b4cc80d3..241e2b4df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -451,7 +451,6 @@ ExternalProject_Add(generate_translations_header CMAKE_ARGS -DLRELEASE_PATH=${LRELEASE_PATH} INSTALL_COMMAND cmake -E echo "") include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations") -add_subdirectory(external) # Final setup for libunbound include_directories(${UNBOUND_INCLUDE}) @@ -1024,3 +1023,5 @@ if (iwyu_tool_path AND PYTHONINTERP_FOUND) VERBATIM ) endif() + +add_subdirectory(external) diff --git a/external/easylogging++/CMakeLists.txt b/external/easylogging++/CMakeLists.txt index 35fb86552..b9b9aea91 100644 --- a/external/easylogging++/CMakeLists.txt +++ b/external/easylogging++/CMakeLists.txt @@ -40,6 +40,7 @@ add_library(easylogging include_directories("${CMAKE_CURRENT_SOURCE_DIR}") include_directories("${CMAKE_CURRENT_BINARY_DIR}") +include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) target_link_libraries(easylogging PRIVATE ${CMAKE_THREAD_LIBS_INIT} |