From 31bf2e25c5f96c02918cb3f750e061152b25e868 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Tue, 24 Sep 2019 20:09:17 +0000 Subject: Revert "easylogging++: ensure it finds boost headers" This reverts commit 9a95827ea72574c3e861aa3167c0b96b9bae64b3. --- CMakeLists.txt | 3 +-- external/easylogging++/CMakeLists.txt | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 241e2b4df..6b4cc80d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -451,6 +451,7 @@ 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}) @@ -1023,5 +1024,3 @@ 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 b9b9aea91..35fb86552 100644 --- a/external/easylogging++/CMakeLists.txt +++ b/external/easylogging++/CMakeLists.txt @@ -40,7 +40,6 @@ 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} -- cgit v1.2.3