Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

Removed epee from tor lib, moved boost minimal version to 1.70

Browse source
This commit is contained in:
cryptozoidberg 2022-04-14 19:16:25 +02:00
parent f201fbf285
commit 2b2ee25bb7
No known key found for this signature in database
GPG key ID: 22DEB97A54C6FDEC
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -57,9 +57,6 @@ endif()
set(USE_PCH FALSE CACHE BOOL "Use shared precompiled headers")
get_filename_component(EPEE_INCLUDE_PATH_FOR_SUBMODULES contrib/epee/include ABSOLUTE )
message("Epee absolute path set to: ${EPEE_INCLUDE_PATH_FOR_SUBMODULES}")
include_directories(src contrib/eos_portable_archive contrib contrib/epee/include "${CMAKE_BINARY_DIR}/version" "${CMAKE_BINARY_DIR}/contrib/zlib")
add_definitions(-DSTATICLIB)
@ -200,7 +197,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
set(Boost_LIBRARY_DIRS "${Boost_LIBRARY_DIRS}/${CMAKE_ANDROID_ARCH_ABI}/")
set(Boost_LIBRARIES "${Boost_LIBRARY_DIRS}libboost_system.a;${Boost_LIBRARY_DIRS}libboost_filesystem.a;${Boost_LIBRARY_DIRS}libboost_thread.a;${Boost_LIBRARY_DIRS}libboost_timer.a;${Boost_LIBRARY_DIRS}libboost_date_time.a;${Boost_LIBRARY_DIRS}libboost_chrono.a;${Boost_LIBRARY_DIRS}libboost_regex.a;${Boost_LIBRARY_DIRS}libboost_serialization.a;${Boost_LIBRARY_DIRS}libboost_atomic.a;${Boost_LIBRARY_DIRS}libboost_program_options.a")
else()
find_package(Boost 1.55 REQUIRED COMPONENTS system filesystem thread timer date_time chrono regex serialization atomic program_options locale)
find_package(Boost 1.70 REQUIRED COMPONENTS system filesystem thread timer date_time chrono regex serialization atomic program_options locale)
endif()

2
contrib/tor-connect

@ -1 +1 @@
Subproject commit 67addabaf7e5fa7e9443f860dfcf62af8bd9b127
Subproject commit aa509880f06292ac8078046f3d49ff854e400716