Dropped "bit" from bitmonero.

This commit is contained in:
Randi Joseph 2016-09-26 10:42:29 -04:00
parent e06530e2d9
commit 2a5139644a
15 changed files with 36 additions and 36 deletions

View file

@ -34,13 +34,13 @@ if (WIN32 OR STATIC)
add_definitions(-DMINIUPNP_STATICLIB) add_definitions(-DMINIUPNP_STATICLIB)
endif () endif ()
function (bitmonero_private_headers group) function (monero_private_headers group)
source_group("${group}\\Private" source_group("${group}\\Private"
FILES FILES
${ARGN}) ${ARGN})
endfunction () endfunction ()
function (bitmonero_install_headers subdir) function (monero_install_headers subdir)
install( install(
FILES ${ARGN} FILES ${ARGN}
DESTINATION "include/${subdir}" DESTINATION "include/${subdir}"
@ -58,7 +58,7 @@ function (enable_stack_trace target)
endif() endif()
endfunction() endfunction()
function (bitmonero_add_executable name) function (monero_add_executable name)
source_group("${name}" source_group("${name}"
FILES FILES
${ARGN}) ${ARGN})
@ -77,7 +77,7 @@ function (bitmonero_add_executable name)
enable_stack_trace("${name}") enable_stack_trace("${name}")
endfunction () endfunction ()
function (bitmonero_add_library name) function (monero_add_library name)
source_group("${name}" source_group("${name}"
FILES FILES
${ARGN}) ${ARGN})

View file

@ -53,9 +53,9 @@ if (BERKELEY_DB)
) )
endif() endif()
bitmonero_private_headers(blockchain_db monero_private_headers(blockchain_db
${crypto_private_headers}) ${crypto_private_headers})
bitmonero_add_library(blockchain_db monero_add_library(blockchain_db
${blockchain_db_sources} ${blockchain_db_sources}
${blockchain_db_headers} ${blockchain_db_headers}
${blockchain_db_private_headers}) ${blockchain_db_private_headers})

View file

@ -39,7 +39,7 @@ set(blockchain_import_private_headers
bootstrap_serialization.h bootstrap_serialization.h
) )
bitmonero_private_headers(blockchain_import monero_private_headers(blockchain_import
${blockchain_import_private_headers}) ${blockchain_import_private_headers})
set(blockchain_export_sources set(blockchain_export_sources
@ -54,11 +54,11 @@ set(blockchain_export_private_headers
bootstrap_serialization.h bootstrap_serialization.h
) )
bitmonero_private_headers(blockchain_export monero_private_headers(blockchain_export
${blockchain_export_private_headers}) ${blockchain_export_private_headers})
bitmonero_add_executable(blockchain_import monero_add_executable(blockchain_import
${blockchain_import_sources} ${blockchain_import_sources}
${blockchain_import_private_headers}) ${blockchain_import_private_headers})
@ -80,7 +80,7 @@ set_property(TARGET blockchain_import
PROPERTY PROPERTY
OUTPUT_NAME "monero-blockchain-import") OUTPUT_NAME "monero-blockchain-import")
bitmonero_add_executable(blockchain_export monero_add_executable(blockchain_export
${blockchain_export_sources} ${blockchain_export_sources}
${blockchain_export_private_headers}) ${blockchain_export_private_headers})

View file

@ -55,9 +55,9 @@ set(common_private_headers
i18n.h i18n.h
stack_trace.h) stack_trace.h)
bitmonero_private_headers(common monero_private_headers(common
${common_private_headers}) ${common_private_headers})
bitmonero_add_library(common monero_add_library(common
${common_sources} ${common_sources}
${common_headers} ${common_headers}
${common_private_headers}) ${common_private_headers})
@ -71,5 +71,5 @@ target_link_libraries(common
${Boost_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
#bitmonero_install_headers(common #monero_install_headers(common
# ${common_headers}) # ${common_headers})

View file

@ -68,9 +68,9 @@ set(crypto_private_headers
skein.h skein.h
skein_port.h) skein_port.h)
bitmonero_private_headers(crypto monero_private_headers(crypto
${crypto_private_headers}) ${crypto_private_headers})
bitmonero_add_library(crypto monero_add_library(crypto
${crypto_sources} ${crypto_sources}
${crypto_headers} ${crypto_headers}
${crypto_private_headers}) ${crypto_private_headers})

View file

@ -66,9 +66,9 @@ else()
set(Blocks "") set(Blocks "")
endif() endif()
bitmonero_private_headers(cryptonote_core monero_private_headers(cryptonote_core
${crypto_private_headers}) ${crypto_private_headers})
bitmonero_add_library(cryptonote_core monero_add_library(cryptonote_core
${cryptonote_core_sources} ${cryptonote_core_sources}
${cryptonote_core_headers} ${cryptonote_core_headers}
${cryptonote_core_private_headers}) ${cryptonote_core_private_headers})

View file

@ -27,15 +27,15 @@
# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
cmake_minimum_required (VERSION 2.6) cmake_minimum_required (VERSION 2.6)
project (bitmonero CXX) project (monero CXX)
file(GLOB CRYPTONOTE_PROTOCOL *) file(GLOB CRYPTONOTE_PROTOCOL *)
source_group(cryptonote_protocol FILES ${CRYPTONOTE_PROTOCOL}) source_group(cryptonote_protocol FILES ${CRYPTONOTE_PROTOCOL})
#add_library(p2p ${P2P}) #add_library(p2p ${P2P})
#bitmonero_private_headers(p2p ${CRYPTONOTE_PROTOCOL}) #monero_private_headers(p2p ${CRYPTONOTE_PROTOCOL})
bitmonero_add_library(cryptonote_protocol ${CRYPTONOTE_PROTOCOL}) monero_add_library(cryptonote_protocol ${CRYPTONOTE_PROTOCOL})
#target_link_libraries(p2p) #target_link_libraries(p2p)
# LINK_PRIVATE # LINK_PRIVATE
# ${Boost_CHRONO_LIBRARY} # ${Boost_CHRONO_LIBRARY}

View file

@ -74,9 +74,9 @@ set(daemon_private_headers
../p2p/p2p_protocol_defs.h ../p2p/p2p_protocol_defs.h
../p2p/stdafx.h) ../p2p/stdafx.h)
bitmonero_private_headers(daemon monero_private_headers(daemon
${daemon_private_headers}) ${daemon_private_headers})
bitmonero_add_executable(daemon monero_add_executable(daemon
${daemon_sources} ${daemon_sources}
${daemon_headers} ${daemon_headers}
${daemon_private_headers} ${daemon_private_headers}

View file

@ -54,9 +54,9 @@ else()
) )
endif() endif()
bitmonero_private_headers(daemonizer monero_private_headers(daemonizer
${daemonizer_private_headers}) ${daemonizer_private_headers})
bitmonero_add_library(daemonizer monero_add_library(daemonizer
${daemonizer_sources} ${daemonizer_sources}
${daemonizer_headers} ${daemonizer_headers}
${daemonizer_private_headers}) ${daemonizer_private_headers})

View file

@ -44,9 +44,9 @@ set(mnemonics_private_headers
singleton.h singleton.h
spanish.h) spanish.h)
bitmonero_private_headers(mnemonics monero_private_headers(mnemonics
${mnemonics_private_headers}) ${mnemonics_private_headers})
bitmonero_add_library(mnemonics monero_add_library(mnemonics
${mnemonics_sources} ${mnemonics_sources}
${mnemonics_headers} ${mnemonics_headers}
${mnemonics_private_headers}) ${mnemonics_private_headers})

View file

@ -34,8 +34,8 @@ source_group(p2p FILES ${P2P})
#add_library(p2p ${P2P}) #add_library(p2p ${P2P})
#bitmonero_private_headers(p2p ${P2P}) #monero_private_headers(p2p ${P2P})
bitmonero_add_library(p2p ${P2P}) monero_add_library(p2p ${P2P})
#target_link_libraries(p2p) #target_link_libraries(p2p)
# LINK_PRIVATE # LINK_PRIVATE
# ${Boost_CHRONO_LIBRARY} # ${Boost_CHRONO_LIBRARY}

View file

@ -39,9 +39,9 @@ set(ringct_private_headers
rctSigs.h rctSigs.h
rctTypes.h) rctTypes.h)
bitmonero_private_headers(ringct monero_private_headers(ringct
${crypto_private_headers}) ${crypto_private_headers})
bitmonero_add_library(ringct monero_add_library(ringct
${ringct_sources} ${ringct_sources}
${ringct_headers} ${ringct_headers}
${ringct_private_headers}) ${ringct_private_headers})

View file

@ -36,9 +36,9 @@ set(rpc_private_headers
core_rpc_server_commands_defs.h core_rpc_server_commands_defs.h
core_rpc_server_error_codes.h) core_rpc_server_error_codes.h)
bitmonero_private_headers(rpc monero_private_headers(rpc
${rpc_private_headers}) ${rpc_private_headers})
bitmonero_add_library(rpc monero_add_library(rpc
${rpc_sources} ${rpc_sources}
${rpc_headers} ${rpc_headers}
${rpc_private_headers}) ${rpc_private_headers})

View file

@ -36,9 +36,9 @@ set(simplewallet_private_headers
simplewallet.h simplewallet.h
password_container.h) password_container.h)
bitmonero_private_headers(simplewallet monero_private_headers(simplewallet
${simplewallet_private_headers}) ${simplewallet_private_headers})
bitmonero_add_executable(simplewallet monero_add_executable(simplewallet
${simplewallet_sources} ${simplewallet_sources}
${simplewallet_headers} ${simplewallet_headers}
${simplewallet_private_headers}) ${simplewallet_private_headers})

View file

@ -57,9 +57,9 @@ set(wallet_private_headers
api/pending_transaction.h api/pending_transaction.h
api/common_defines.h) api/common_defines.h)
bitmonero_private_headers(wallet monero_private_headers(wallet
${wallet_private_headers}) ${wallet_private_headers})
bitmonero_add_library(wallet monero_add_library(wallet
${wallet_sources} ${wallet_sources}
${wallet_api_headers} ${wallet_api_headers}
${wallet_private_headers}) ${wallet_private_headers})