more fixes for mac

This commit is contained in:
Crypto City 2020-08-20 02:49:36 +00:00
parent dc2cc4b6d5
commit 4803e6f508
2 changed files with 7 additions and 9 deletions

View File

@ -307,14 +307,12 @@ endif()
# elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*")
# set(BSDI TRUE)
if (APPLE)
# set boost directories early to override any /usr/local/include from elsewhere that might find boost there
set(Boost_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/external/boost-libs/install/include)
set(Boost_LIBRARY_DIRS ${CMAKE_CURRENT_BINARY_DIR}/external/boost-libs/install/lib/)
include_directories(${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})
link_directories(${CMAKE_CURRENT_BINARY_DIR}/external/unbound)
endif()
# set boost directories early to override any /usr/local/include from elsewhere that might find boost there
set(Boost_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/external/boost-libs/install/include)
set(Boost_LIBRARY_DIRS ${CMAKE_CURRENT_BINARY_DIR}/external/boost-libs/install/lib/)
include_directories(${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})
link_directories(${CMAKE_CURRENT_BINARY_DIR}/external/unbound)
include_directories(external/db_drivers/liblmdb external/rapidjson/include external/easylogging++ src contrib/epee/include external)

2
external/tb vendored

@ -1 +1 @@
Subproject commit 39a52b9d9e8b1b57b02de1545d5adc01591b0a98
Subproject commit be6666b646e09bd18f8184e14d9bc998b94f5d13