nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5928

Browse Source 
9a95827 easylogging++: ensure it finds boost headers (moneromooo-monero)
This commit is contained in:
luigi1111 2019-09-24 13:50:35 -05:00
commit faf5805fc0
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -451,7 +451,6 @@ ExternalProject_Add(generate_translations_header
CMAKE_ARGS -DLRELEASE_PATH=${LRELEASE_PATH} CMAKE_ARGS -DLRELEASE_PATH=${LRELEASE_PATH}
INSTALL_COMMAND cmake -E echo "") INSTALL_COMMAND cmake -E echo "")
include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations") include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
add_subdirectory(external)
# Final setup for libunbound # Final setup for libunbound
include_directories(${UNBOUND_INCLUDE}) include_directories(${UNBOUND_INCLUDE})
@ -1024,3 +1023,5 @@ if (iwyu_tool_path AND PYTHONINTERP_FOUND)
VERBATIM VERBATIM
) )
endif() endif()
add_subdirectory(external)

1
external/easylogging++/CMakeLists.txt vendored
View File

@ -40,6 +40,7 @@ add_library(easylogging
include_directories("${CMAKE_CURRENT_SOURCE_DIR}") include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
include_directories("${CMAKE_CURRENT_BINARY_DIR}") include_directories("${CMAKE_CURRENT_BINARY_DIR}")
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
target_link_libraries(easylogging target_link_libraries(easylogging
PRIVATE PRIVATE
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}