From d6d5e57e49f68f596f574f2ba25f9b8c50fbac2e Mon Sep 17 00:00:00 2001 From: moneroexamples Date: Wed, 4 Jan 2017 00:54:10 +0000 Subject: [PATCH] cmake updated --- CMakeLists.txt | 17 ++++++++++++----- src/CurrentBlockchainStatus.h | 4 ++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f4a51fb..5afd98e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,8 @@ cmake_minimum_required(VERSION 3.2) project(restbed_xmr) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} -std=c++14") # find boost find_package(Boost COMPONENTS @@ -43,8 +44,8 @@ set_property(TARGET common PROPERTY IMPORTED_LOCATION ${MONERO_LIBS_DIR}/libcomm add_library(blocks STATIC IMPORTED) set_property(TARGET blocks PROPERTY IMPORTED_LOCATION ${MONERO_LIBS_DIR}/libblocks.a) -add_library(crypto STATIC IMPORTED) -set_property(TARGET crypto +add_library(cryptoxmr STATIC IMPORTED) +set_property(TARGET cryptoxmr PROPERTY IMPORTED_LOCATION ${MONERO_LIBS_DIR}/libcrypto.a) add_library(cryptonote_core STATIC IMPORTED) @@ -55,6 +56,10 @@ add_library(cryptonote_protocol STATIC IMPORTED) set_property(TARGET cryptonote_protocol PROPERTY IMPORTED_LOCATION ${MONERO_LIBS_DIR}/libcryptonote_protocol.a) +add_library(mnemonics STATIC IMPORTED) +set_property(TARGET mnemonics + PROPERTY IMPORTED_LOCATION ${MONERO_LIBS_DIR}/libmnemonics.a) + add_library(blockchain_db STATIC IMPORTED) set_property(TARGET blockchain_db PROPERTY IMPORTED_LOCATION ${MONERO_LIBS_DIR}/libblockchain_db.a) @@ -99,11 +104,12 @@ target_link_libraries(restbed_xmr cryptonote_core cryptonote_protocol blockchain_db - crypto + cryptoxmr blocks lmdb ringct common + mnemonics mysqlpp mysqlclient ${Boost_LIBRARIES} @@ -111,4 +117,5 @@ target_link_libraries(restbed_xmr unbound unwind curl - dl) \ No newline at end of file + dl + crypto) \ No newline at end of file diff --git a/src/CurrentBlockchainStatus.h b/src/CurrentBlockchainStatus.h index 2a3d154..0a45669 100644 --- a/src/CurrentBlockchainStatus.h +++ b/src/CurrentBlockchainStatus.h @@ -216,7 +216,7 @@ struct CurrentBlockchainStatus static bool ping_search_thread(const string& address); - static bool + static void clean_search_thread_map(); }; @@ -866,7 +866,7 @@ CurrentBlockchainStatus::ping_search_thread(const string& address) } -bool +void CurrentBlockchainStatus::clean_search_thread_map() { std::lock_guard lck (searching_threads_map_mtx);