From 2a5139644af29bef0346f90cc98d0e03827ec7c6 Mon Sep 17 00:00:00 2001 From: Randi Joseph Date: Mon, 26 Sep 2016 10:42:29 -0400 Subject: [PATCH 1/8] Dropped "bit" from bitmonero. --- src/CMakeLists.txt | 8 ++++---- src/blockchain_db/CMakeLists.txt | 4 ++-- src/blockchain_utilities/CMakeLists.txt | 8 ++++---- src/common/CMakeLists.txt | 6 +++--- src/crypto/CMakeLists.txt | 4 ++-- src/cryptonote_core/CMakeLists.txt | 4 ++-- src/cryptonote_protocol/CMakeLists.txt | 6 +++--- src/daemon/CMakeLists.txt | 4 ++-- src/daemonizer/CMakeLists.txt | 4 ++-- src/mnemonics/CMakeLists.txt | 4 ++-- src/p2p/CMakeLists.txt | 4 ++-- src/ringct/CMakeLists.txt | 4 ++-- src/rpc/CMakeLists.txt | 4 ++-- src/simplewallet/CMakeLists.txt | 4 ++-- src/wallet/CMakeLists.txt | 4 ++-- 15 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 55a276f06..28febe6b7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -34,13 +34,13 @@ if (WIN32 OR STATIC) add_definitions(-DMINIUPNP_STATICLIB) endif () -function (bitmonero_private_headers group) +function (monero_private_headers group) source_group("${group}\\Private" FILES ${ARGN}) endfunction () -function (bitmonero_install_headers subdir) +function (monero_install_headers subdir) install( FILES ${ARGN} DESTINATION "include/${subdir}" @@ -58,7 +58,7 @@ function (enable_stack_trace target) endif() endfunction() -function (bitmonero_add_executable name) +function (monero_add_executable name) source_group("${name}" FILES ${ARGN}) @@ -77,7 +77,7 @@ function (bitmonero_add_executable name) enable_stack_trace("${name}") endfunction () -function (bitmonero_add_library name) +function (monero_add_library name) source_group("${name}" FILES ${ARGN}) diff --git a/src/blockchain_db/CMakeLists.txt b/src/blockchain_db/CMakeLists.txt index 39459d5c4..cee7b067e 100644 --- a/src/blockchain_db/CMakeLists.txt +++ b/src/blockchain_db/CMakeLists.txt @@ -53,9 +53,9 @@ if (BERKELEY_DB) ) endif() -bitmonero_private_headers(blockchain_db +monero_private_headers(blockchain_db ${crypto_private_headers}) -bitmonero_add_library(blockchain_db +monero_add_library(blockchain_db ${blockchain_db_sources} ${blockchain_db_headers} ${blockchain_db_private_headers}) diff --git a/src/blockchain_utilities/CMakeLists.txt b/src/blockchain_utilities/CMakeLists.txt index 6f62128cc..272798e92 100644 --- a/src/blockchain_utilities/CMakeLists.txt +++ b/src/blockchain_utilities/CMakeLists.txt @@ -39,7 +39,7 @@ set(blockchain_import_private_headers bootstrap_serialization.h ) -bitmonero_private_headers(blockchain_import +monero_private_headers(blockchain_import ${blockchain_import_private_headers}) set(blockchain_export_sources @@ -54,11 +54,11 @@ set(blockchain_export_private_headers bootstrap_serialization.h ) -bitmonero_private_headers(blockchain_export +monero_private_headers(blockchain_export ${blockchain_export_private_headers}) -bitmonero_add_executable(blockchain_import +monero_add_executable(blockchain_import ${blockchain_import_sources} ${blockchain_import_private_headers}) @@ -80,7 +80,7 @@ set_property(TARGET blockchain_import PROPERTY OUTPUT_NAME "monero-blockchain-import") -bitmonero_add_executable(blockchain_export +monero_add_executable(blockchain_export ${blockchain_export_sources} ${blockchain_export_private_headers}) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 7a2457c93..654480af3 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -55,9 +55,9 @@ set(common_private_headers i18n.h stack_trace.h) -bitmonero_private_headers(common +monero_private_headers(common ${common_private_headers}) -bitmonero_add_library(common +monero_add_library(common ${common_sources} ${common_headers} ${common_private_headers}) @@ -71,5 +71,5 @@ target_link_libraries(common ${Boost_SYSTEM_LIBRARY} ${EXTRA_LIBRARIES}) -#bitmonero_install_headers(common +#monero_install_headers(common # ${common_headers}) diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt index ed668022f..338384cba 100644 --- a/src/crypto/CMakeLists.txt +++ b/src/crypto/CMakeLists.txt @@ -68,9 +68,9 @@ set(crypto_private_headers skein.h skein_port.h) -bitmonero_private_headers(crypto +monero_private_headers(crypto ${crypto_private_headers}) -bitmonero_add_library(crypto +monero_add_library(crypto ${crypto_sources} ${crypto_headers} ${crypto_private_headers}) diff --git a/src/cryptonote_core/CMakeLists.txt b/src/cryptonote_core/CMakeLists.txt index 4ebfd01e3..7c60bcdee 100644 --- a/src/cryptonote_core/CMakeLists.txt +++ b/src/cryptonote_core/CMakeLists.txt @@ -66,9 +66,9 @@ else() set(Blocks "") endif() -bitmonero_private_headers(cryptonote_core +monero_private_headers(cryptonote_core ${crypto_private_headers}) -bitmonero_add_library(cryptonote_core +monero_add_library(cryptonote_core ${cryptonote_core_sources} ${cryptonote_core_headers} ${cryptonote_core_private_headers}) diff --git a/src/cryptonote_protocol/CMakeLists.txt b/src/cryptonote_protocol/CMakeLists.txt index 0d759e9c4..6b7d6f79c 100644 --- a/src/cryptonote_protocol/CMakeLists.txt +++ b/src/cryptonote_protocol/CMakeLists.txt @@ -27,15 +27,15 @@ # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. cmake_minimum_required (VERSION 2.6) -project (bitmonero CXX) +project (monero CXX) file(GLOB CRYPTONOTE_PROTOCOL *) source_group(cryptonote_protocol FILES ${CRYPTONOTE_PROTOCOL}) #add_library(p2p ${P2P}) -#bitmonero_private_headers(p2p ${CRYPTONOTE_PROTOCOL}) -bitmonero_add_library(cryptonote_protocol ${CRYPTONOTE_PROTOCOL}) +#monero_private_headers(p2p ${CRYPTONOTE_PROTOCOL}) +monero_add_library(cryptonote_protocol ${CRYPTONOTE_PROTOCOL}) #target_link_libraries(p2p) # LINK_PRIVATE # ${Boost_CHRONO_LIBRARY} diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt index a8c93aa0f..90c0299fe 100644 --- a/src/daemon/CMakeLists.txt +++ b/src/daemon/CMakeLists.txt @@ -74,9 +74,9 @@ set(daemon_private_headers ../p2p/p2p_protocol_defs.h ../p2p/stdafx.h) -bitmonero_private_headers(daemon +monero_private_headers(daemon ${daemon_private_headers}) -bitmonero_add_executable(daemon +monero_add_executable(daemon ${daemon_sources} ${daemon_headers} ${daemon_private_headers} diff --git a/src/daemonizer/CMakeLists.txt b/src/daemonizer/CMakeLists.txt index 3ca6841e5..778f4e4e6 100644 --- a/src/daemonizer/CMakeLists.txt +++ b/src/daemonizer/CMakeLists.txt @@ -54,9 +54,9 @@ else() ) endif() -bitmonero_private_headers(daemonizer +monero_private_headers(daemonizer ${daemonizer_private_headers}) -bitmonero_add_library(daemonizer +monero_add_library(daemonizer ${daemonizer_sources} ${daemonizer_headers} ${daemonizer_private_headers}) diff --git a/src/mnemonics/CMakeLists.txt b/src/mnemonics/CMakeLists.txt index 1d43a02e7..cef406c0a 100644 --- a/src/mnemonics/CMakeLists.txt +++ b/src/mnemonics/CMakeLists.txt @@ -44,9 +44,9 @@ set(mnemonics_private_headers singleton.h spanish.h) -bitmonero_private_headers(mnemonics +monero_private_headers(mnemonics ${mnemonics_private_headers}) -bitmonero_add_library(mnemonics +monero_add_library(mnemonics ${mnemonics_sources} ${mnemonics_headers} ${mnemonics_private_headers}) diff --git a/src/p2p/CMakeLists.txt b/src/p2p/CMakeLists.txt index 73b39c45d..0e43abd39 100644 --- a/src/p2p/CMakeLists.txt +++ b/src/p2p/CMakeLists.txt @@ -34,8 +34,8 @@ source_group(p2p FILES ${P2P}) #add_library(p2p ${P2P}) -#bitmonero_private_headers(p2p ${P2P}) -bitmonero_add_library(p2p ${P2P}) +#monero_private_headers(p2p ${P2P}) +monero_add_library(p2p ${P2P}) #target_link_libraries(p2p) # LINK_PRIVATE # ${Boost_CHRONO_LIBRARY} diff --git a/src/ringct/CMakeLists.txt b/src/ringct/CMakeLists.txt index 078199bb0..594b53b95 100644 --- a/src/ringct/CMakeLists.txt +++ b/src/ringct/CMakeLists.txt @@ -39,9 +39,9 @@ set(ringct_private_headers rctSigs.h rctTypes.h) -bitmonero_private_headers(ringct +monero_private_headers(ringct ${crypto_private_headers}) -bitmonero_add_library(ringct +monero_add_library(ringct ${ringct_sources} ${ringct_headers} ${ringct_private_headers}) diff --git a/src/rpc/CMakeLists.txt b/src/rpc/CMakeLists.txt index 6e90d1a91..2e57e62a2 100644 --- a/src/rpc/CMakeLists.txt +++ b/src/rpc/CMakeLists.txt @@ -36,9 +36,9 @@ set(rpc_private_headers core_rpc_server_commands_defs.h core_rpc_server_error_codes.h) -bitmonero_private_headers(rpc +monero_private_headers(rpc ${rpc_private_headers}) -bitmonero_add_library(rpc +monero_add_library(rpc ${rpc_sources} ${rpc_headers} ${rpc_private_headers}) diff --git a/src/simplewallet/CMakeLists.txt b/src/simplewallet/CMakeLists.txt index 572819899..1e34d608f 100644 --- a/src/simplewallet/CMakeLists.txt +++ b/src/simplewallet/CMakeLists.txt @@ -36,9 +36,9 @@ set(simplewallet_private_headers simplewallet.h password_container.h) -bitmonero_private_headers(simplewallet +monero_private_headers(simplewallet ${simplewallet_private_headers}) -bitmonero_add_executable(simplewallet +monero_add_executable(simplewallet ${simplewallet_sources} ${simplewallet_headers} ${simplewallet_private_headers}) diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt index 96653556b..cdc460a50 100644 --- a/src/wallet/CMakeLists.txt +++ b/src/wallet/CMakeLists.txt @@ -57,9 +57,9 @@ set(wallet_private_headers api/pending_transaction.h api/common_defines.h) -bitmonero_private_headers(wallet +monero_private_headers(wallet ${wallet_private_headers}) -bitmonero_add_library(wallet +monero_add_library(wallet ${wallet_sources} ${wallet_api_headers} ${wallet_private_headers}) From 3627cea34a25b80de0df1fe1aa9ae09e1a9b8082 Mon Sep 17 00:00:00 2001 From: Randi Joseph Date: Mon, 26 Sep 2016 16:47:07 -0400 Subject: [PATCH 2/8] Cleanup. Dropped "bit" from bitmonero. --- src/p2p/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p2p/CMakeLists.txt b/src/p2p/CMakeLists.txt index 0e43abd39..7f240ab1a 100644 --- a/src/p2p/CMakeLists.txt +++ b/src/p2p/CMakeLists.txt @@ -27,7 +27,7 @@ # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. cmake_minimum_required (VERSION 2.6) -project (bitmonero CXX) +project (monero CXX) file(GLOB P2P *) source_group(p2p FILES ${P2P}) From 9e54616924c781def53f7f6ece73c0d921e81995 Mon Sep 17 00:00:00 2001 From: Randi Joseph Date: Mon, 26 Sep 2016 10:42:29 -0400 Subject: [PATCH 3/8] Dropped "bit" from bitmonero. --- src/CMakeLists.txt | 8 ++++---- src/blockchain_db/CMakeLists.txt | 4 ++-- src/blockchain_utilities/CMakeLists.txt | 8 ++++---- src/common/CMakeLists.txt | 6 +++--- src/crypto/CMakeLists.txt | 4 ++-- src/cryptonote_core/CMakeLists.txt | 4 ++-- src/daemon/CMakeLists.txt | 4 ++-- src/daemonizer/CMakeLists.txt | 4 ++-- src/mnemonics/CMakeLists.txt | 4 ++-- src/ringct/CMakeLists.txt | 4 ++-- src/rpc/CMakeLists.txt | 4 ++-- src/simplewallet/CMakeLists.txt | 4 ++-- src/wallet/CMakeLists.txt | 4 ++-- 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 31694cf81..fc7d60e4c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -34,13 +34,13 @@ if (WIN32 OR STATIC) add_definitions(-DMINIUPNP_STATICLIB) endif () -function (bitmonero_private_headers group) +function (monero_private_headers group) source_group("${group}\\Private" FILES ${ARGN}) endfunction () -function (bitmonero_install_headers subdir) +function (monero_install_headers subdir) install( FILES ${ARGN} DESTINATION "include/${subdir}" @@ -58,7 +58,7 @@ function (enable_stack_trace target) endif() endfunction() -function (bitmonero_add_executable name) +function (monero_add_executable name) source_group("${name}" FILES ${ARGN}) @@ -77,7 +77,7 @@ function (bitmonero_add_executable name) enable_stack_trace("${name}") endfunction () -function (bitmonero_add_library name) +function (monero_add_library name) source_group("${name}" FILES ${ARGN}) diff --git a/src/blockchain_db/CMakeLists.txt b/src/blockchain_db/CMakeLists.txt index 7bca66b8b..cefe93ebe 100644 --- a/src/blockchain_db/CMakeLists.txt +++ b/src/blockchain_db/CMakeLists.txt @@ -53,9 +53,9 @@ if (BERKELEY_DB) ) endif() -bitmonero_private_headers(blockchain_db +monero_private_headers(blockchain_db ${crypto_private_headers}) -bitmonero_add_library(blockchain_db +monero_add_library(blockchain_db ${blockchain_db_sources} ${blockchain_db_headers} ${blockchain_db_private_headers}) diff --git a/src/blockchain_utilities/CMakeLists.txt b/src/blockchain_utilities/CMakeLists.txt index 13093f6ad..ccfd4a279 100644 --- a/src/blockchain_utilities/CMakeLists.txt +++ b/src/blockchain_utilities/CMakeLists.txt @@ -39,7 +39,7 @@ set(blockchain_import_private_headers bootstrap_serialization.h ) -bitmonero_private_headers(blockchain_import +monero_private_headers(blockchain_import ${blockchain_import_private_headers}) set(blockchain_export_sources @@ -54,11 +54,11 @@ set(blockchain_export_private_headers bootstrap_serialization.h ) -bitmonero_private_headers(blockchain_export +monero_private_headers(blockchain_export ${blockchain_export_private_headers}) -bitmonero_add_executable(blockchain_import +monero_add_executable(blockchain_import ${blockchain_import_sources} ${blockchain_import_private_headers}) @@ -84,7 +84,7 @@ set_property(TARGET blockchain_import PROPERTY OUTPUT_NAME "monero-blockchain-import") -bitmonero_add_executable(blockchain_export +monero_add_executable(blockchain_export ${blockchain_export_sources} ${blockchain_export_private_headers}) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 744559072..6bf8b1777 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -55,9 +55,9 @@ set(common_private_headers i18n.h stack_trace.h) -bitmonero_private_headers(common +monero_private_headers(common ${common_private_headers}) -bitmonero_add_library(common +monero_add_library(common ${common_sources} ${common_headers} ${common_private_headers}) @@ -73,5 +73,5 @@ target_link_libraries(common PRIVATE ${EXTRA_LIBRARIES}) -#bitmonero_install_headers(common +#monero_install_headers(common # ${common_headers}) diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt index 28f845d47..9d83caca8 100644 --- a/src/crypto/CMakeLists.txt +++ b/src/crypto/CMakeLists.txt @@ -68,9 +68,9 @@ set(crypto_private_headers skein.h skein_port.h) -bitmonero_private_headers(crypto +monero_private_headers(crypto ${crypto_private_headers}) -bitmonero_add_library(crypto +monero_add_library(crypto ${crypto_sources} ${crypto_headers} ${crypto_private_headers}) diff --git a/src/cryptonote_core/CMakeLists.txt b/src/cryptonote_core/CMakeLists.txt index 89bf2f682..3b676e8ce 100644 --- a/src/cryptonote_core/CMakeLists.txt +++ b/src/cryptonote_core/CMakeLists.txt @@ -66,9 +66,9 @@ else() set(Blocks "") endif() -bitmonero_private_headers(cryptonote_core +monero_private_headers(cryptonote_core ${crypto_private_headers}) -bitmonero_add_library(cryptonote_core +monero_add_library(cryptonote_core ${cryptonote_core_sources} ${cryptonote_core_headers} ${cryptonote_core_private_headers}) diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt index 8f9a50f13..0f4baf932 100644 --- a/src/daemon/CMakeLists.txt +++ b/src/daemon/CMakeLists.txt @@ -74,9 +74,9 @@ set(daemon_private_headers ../p2p/p2p_protocol_defs.h ../p2p/stdafx.h) -bitmonero_private_headers(daemon +monero_private_headers(daemon ${daemon_private_headers}) -bitmonero_add_executable(daemon +monero_add_executable(daemon ${daemon_sources} ${daemon_headers} ${daemon_private_headers} diff --git a/src/daemonizer/CMakeLists.txt b/src/daemonizer/CMakeLists.txt index eee2c5091..964c8cc6f 100644 --- a/src/daemonizer/CMakeLists.txt +++ b/src/daemonizer/CMakeLists.txt @@ -54,9 +54,9 @@ else() ) endif() -bitmonero_private_headers(daemonizer +monero_private_headers(daemonizer ${daemonizer_private_headers}) -bitmonero_add_library(daemonizer +monero_add_library(daemonizer ${daemonizer_sources} ${daemonizer_headers} ${daemonizer_private_headers}) diff --git a/src/mnemonics/CMakeLists.txt b/src/mnemonics/CMakeLists.txt index 34670f32d..936c43b99 100644 --- a/src/mnemonics/CMakeLists.txt +++ b/src/mnemonics/CMakeLists.txt @@ -44,9 +44,9 @@ set(mnemonics_private_headers singleton.h spanish.h) -bitmonero_private_headers(mnemonics +monero_private_headers(mnemonics ${mnemonics_private_headers}) -bitmonero_add_library(mnemonics +monero_add_library(mnemonics ${mnemonics_sources} ${mnemonics_headers} ${mnemonics_private_headers}) diff --git a/src/ringct/CMakeLists.txt b/src/ringct/CMakeLists.txt index e513c5a09..334a7f350 100644 --- a/src/ringct/CMakeLists.txt +++ b/src/ringct/CMakeLists.txt @@ -39,9 +39,9 @@ set(ringct_private_headers rctSigs.h rctTypes.h) -bitmonero_private_headers(ringct +monero_private_headers(ringct ${crypto_private_headers}) -bitmonero_add_library(ringct +monero_add_library(ringct ${ringct_sources} ${ringct_headers} ${ringct_private_headers}) diff --git a/src/rpc/CMakeLists.txt b/src/rpc/CMakeLists.txt index 1716da75b..050b5e569 100644 --- a/src/rpc/CMakeLists.txt +++ b/src/rpc/CMakeLists.txt @@ -36,9 +36,9 @@ set(rpc_private_headers core_rpc_server_commands_defs.h core_rpc_server_error_codes.h) -bitmonero_private_headers(rpc +monero_private_headers(rpc ${rpc_private_headers}) -bitmonero_add_library(rpc +monero_add_library(rpc ${rpc_sources} ${rpc_headers} ${rpc_private_headers}) diff --git a/src/simplewallet/CMakeLists.txt b/src/simplewallet/CMakeLists.txt index 5745781ef..cb9ba2b7c 100644 --- a/src/simplewallet/CMakeLists.txt +++ b/src/simplewallet/CMakeLists.txt @@ -36,9 +36,9 @@ set(simplewallet_private_headers simplewallet.h password_container.h) -bitmonero_private_headers(simplewallet +monero_private_headers(simplewallet ${simplewallet_private_headers}) -bitmonero_add_executable(simplewallet +monero_add_executable(simplewallet ${simplewallet_sources} ${simplewallet_headers} ${simplewallet_private_headers}) diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt index 506eaef85..4f82b3c82 100644 --- a/src/wallet/CMakeLists.txt +++ b/src/wallet/CMakeLists.txt @@ -57,9 +57,9 @@ set(wallet_private_headers api/pending_transaction.h api/common_defines.h) -bitmonero_private_headers(wallet +monero_private_headers(wallet ${wallet_private_headers}) -bitmonero_add_library(wallet +monero_add_library(wallet ${wallet_sources} ${wallet_api_headers} ${wallet_private_headers}) From 1e6aedba8b68c9449ac10340b945f4801a363aec Mon Sep 17 00:00:00 2001 From: Randi Joseph Date: Mon, 26 Sep 2016 16:47:07 -0400 Subject: [PATCH 4/8] Cleanup. Dropped "bit" from bitmonero. --- src/p2p/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p2p/CMakeLists.txt b/src/p2p/CMakeLists.txt index f59bc3189..4e1dd516c 100644 --- a/src/p2p/CMakeLists.txt +++ b/src/p2p/CMakeLists.txt @@ -27,7 +27,7 @@ # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. cmake_minimum_required (VERSION 2.6) -project (bitmonero CXX) +project (monero CXX) file(GLOB P2P *) source_group(p2p FILES ${P2P}) From 78b13d6dac80162625555cdfc8f4d5b2e02af40b Mon Sep 17 00:00:00 2001 From: Randi Joseph Date: Mon, 26 Sep 2016 17:35:10 -0400 Subject: [PATCH 5/8] Cleanup. Dropped "bit" from bitmonero. --- src/cryptonote_protocol/CMakeLists.txt | 6 +++--- src/p2p/CMakeLists.txt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cryptonote_protocol/CMakeLists.txt b/src/cryptonote_protocol/CMakeLists.txt index 21925b60e..65473b117 100644 --- a/src/cryptonote_protocol/CMakeLists.txt +++ b/src/cryptonote_protocol/CMakeLists.txt @@ -27,13 +27,13 @@ # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. cmake_minimum_required (VERSION 2.6) -project (bitmonero CXX) +project (monero CXX) file(GLOB CRYPTONOTE_PROTOCOL *) source_group(cryptonote_protocol FILES ${CRYPTONOTE_PROTOCOL}) -#bitmonero_private_headers(cryptonote_protocol ${CRYPTONOTE_PROTOCOL}) -bitmonero_add_library(cryptonote_protocol ${CRYPTONOTE_PROTOCOL}) +#monero_private_headers(cryptonote_protocol ${CRYPTONOTE_PROTOCOL}) +monero_add_library(cryptonote_protocol ${CRYPTONOTE_PROTOCOL}) target_link_libraries(cryptonote_protocol PRIVATE ${EXTRA_LIBRARIES}) diff --git a/src/p2p/CMakeLists.txt b/src/p2p/CMakeLists.txt index 4e1dd516c..b5b7d87ff 100644 --- a/src/p2p/CMakeLists.txt +++ b/src/p2p/CMakeLists.txt @@ -34,8 +34,8 @@ source_group(p2p FILES ${P2P}) #add_library(p2p ${P2P}) -#bitmonero_private_headers(p2p ${P2P}) -bitmonero_add_library(p2p ${P2P}) +#monero_private_headers(p2p ${P2P}) +monero_add_library(p2p ${P2P}) target_link_libraries(p2p PUBLIC ${UPNP_LIBRARIES} From bd773e7805a83be752e6744ec44c995437aa4744 Mon Sep 17 00:00:00 2001 From: codehalo Date: Tue, 27 Sep 2016 02:10:30 -0400 Subject: [PATCH 6/8] Update CMakeLists.txt --- src/cryptonote_protocol/CMakeLists.txt | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/cryptonote_protocol/CMakeLists.txt b/src/cryptonote_protocol/CMakeLists.txt index 11d2d4e3b..071573111 100644 --- a/src/cryptonote_protocol/CMakeLists.txt +++ b/src/cryptonote_protocol/CMakeLists.txt @@ -27,21 +27,16 @@ # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. cmake_minimum_required (VERSION 2.6) -project (bitmonero CXX) +project (monero CXX) file(GLOB CRYPTONOTE_PROTOCOL *) source_group(cryptonote_protocol FILES ${CRYPTONOTE_PROTOCOL}) -#add_library(p2p ${P2P}) - -#monero_private_headers(p2p ${CRYPTONOTE_PROTOCOL}) +#monero_private_headers(cryptonote_protocol ${CRYPTONOTE_PROTOCOL}) monero_add_library(cryptonote_protocol ${CRYPTONOTE_PROTOCOL}) -#target_link_libraries(p2p) -# LINK_PRIVATE -# ${Boost_CHRONO_LIBRARY} -# ${Boost_REGEX_LIBRARY} -# ${Boost_SYSTEM_LIBRARY} -# ${Boost_THREAD_LIBRARY} -# ${EXTRA_LIBRARIES}) +target_link_libraries(cryptonote_protocol + PRIVATE + ${EXTRA_LIBRARIES}) add_dependencies(cryptonote_protocol version) + From 446ebbcd7b7f0fc75844b4771f34551cde046cb7 Mon Sep 17 00:00:00 2001 From: codehalo Date: Tue, 27 Sep 2016 02:11:04 -0400 Subject: [PATCH 7/8] Update CMakeLists.txt --- src/cryptonote_protocol/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cryptonote_protocol/CMakeLists.txt b/src/cryptonote_protocol/CMakeLists.txt index 071573111..34bb73126 100644 --- a/src/cryptonote_protocol/CMakeLists.txt +++ b/src/cryptonote_protocol/CMakeLists.txt @@ -39,4 +39,4 @@ target_link_libraries(cryptonote_protocol ${EXTRA_LIBRARIES}) add_dependencies(cryptonote_protocol version) - + From 01ec1959c3c8eef321d867a9beec794c7d12ef66 Mon Sep 17 00:00:00 2001 From: codehalo Date: Tue, 27 Sep 2016 02:11:23 -0400 Subject: [PATCH 8/8] Update CMakeLists.txt --- src/cryptonote_protocol/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/cryptonote_protocol/CMakeLists.txt b/src/cryptonote_protocol/CMakeLists.txt index 34bb73126..65473b117 100644 --- a/src/cryptonote_protocol/CMakeLists.txt +++ b/src/cryptonote_protocol/CMakeLists.txt @@ -39,4 +39,3 @@ target_link_libraries(cryptonote_protocol ${EXTRA_LIBRARIES}) add_dependencies(cryptonote_protocol version) -