Skip to content

Commit

Permalink
Configuration fixes
Browse files Browse the repository at this point in the history
* Bump minimum required cmake version to 3.3 so we have IN_LIST
* Only add -ldl if it is required and not already specified.
* Remove unnecessary Boost version check, we already require minimum of version 1.58
* Update to latest daemon sources
  • Loading branch information
mtl1979 committed May 27, 2022
1 parent 58f03a7 commit da4142f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
15 changes: 7 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.6)
cmake_minimum_required(VERSION 3.3)
include(CryptoNoteWallet.cmake)
include(CheckSymbolExists)
include(FeatureSummary)
Expand Down Expand Up @@ -59,10 +59,6 @@ else(WIN32)
endif(WIN32)

find_package(Boost 1.58 REQUIRED COMPONENTS date_time filesystem program_options regex serialization system thread chrono)
if ((${Boost_MAJOR_VERSION} EQUAL 1) AND (${Boost_MINOR_VERSION} EQUAL 54))
message(SEND_ERROR "Boost version 1.58 is unsupported, more details are available here http://goo.gl/RrCFmA")
endif ()

include_directories(${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})

Expand Down Expand Up @@ -92,9 +88,11 @@ endif()
find_package(OpenSSL)

if(OPENSSL_FOUND)
## On non MSVC build systems, we need to link ldl with the static OpenSSL library
if(NOT MSVC)
set(OPENSSL_LIBRARIES "${OPENSSL_LIBRARIES};dl")
## On non MSVC build systems, we need to link dl with the static OpenSSL library
if(CMAKE_DL_LIBS)
if(NOT CMAKE_DL_LIBS IN_LIST OPENSSL_LIBRARIES)
set(OPENSSL_LIBRARIES "${OPENSSL_LIBRARIES};${CMAKE_DL_LIBS}")
endif()
endif()

include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR})
Expand Down Expand Up @@ -162,6 +160,7 @@ file(GLOB_RECURSE CRYPTONOTE_SOURCES
cryptonote/src/P2p/*.cpp
cryptonote/src/Rpc/*.cpp
cryptonote/src/Serialization/*.cpp
cryptonote/src/System/PortMapping.cpp
cryptonote/src/Transfers/BlockchainSynchronizer.cpp
cryptonote/src/Transfers/SynchronizationState.cpp
cryptonote/src/Transfers/TransfersConsumer.cpp
Expand Down

0 comments on commit da4142f

Please sign in to comment.