Merge pull request #1139

01ec195 Update CMakeLists.txt (codehalo) 446ebbc Update CMakeLists.txt (codehalo) bd773e7 Update CMakeLists.txt (codehalo) 3627cea Cleanup. Dropped "bit" from bitmonero. (Randi Joseph) 2a51396 Dropped "bit" from bitmonero. (Randi Joseph) 78b13d6 Cleanup. Dropped "bit" from bitmonero. (Randi Joseph) 1e6aedb Cleanup. Dropped "bit" from bitmonero. (Randi Joseph) 9e54616 Dropped "bit" from bitmonero. (Randi Joseph)
2025-03-22 19:46:29 -04:00 · 2016-10-04 12:11:03 +02:00 · 2016-10-04 12:11:03 +02:00 · 4cb1348548
commit 4cb1348548
parent d60826c0b9 01ec1959c3
15 changed files with 37 additions and 37 deletions
--- 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})
--- 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})
--- 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})

--- 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})
--- 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})
--- 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})
--- 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})
--- 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}
--- 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})
--- 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})
--- a/src/p2p/CMakeLists.txt
+++ b/src/p2p/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 P2P *)
 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}
--- 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})
--- 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})
--- 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})
--- 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})