aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/CMakeLists.txt8
-rw-r--r--src/blockchain_db/CMakeLists.txt4
-rw-r--r--src/blockchain_utilities/CMakeLists.txt8
-rw-r--r--src/common/CMakeLists.txt6
-rw-r--r--src/crypto/CMakeLists.txt4
-rw-r--r--src/cryptonote_core/CMakeLists.txt4
-rw-r--r--src/cryptonote_protocol/CMakeLists.txt6
-rw-r--r--src/daemon/CMakeLists.txt4
-rw-r--r--src/daemonizer/CMakeLists.txt4
-rw-r--r--src/mnemonics/CMakeLists.txt4
-rw-r--r--src/p2p/CMakeLists.txt4
-rw-r--r--src/ringct/CMakeLists.txt4
-rw-r--r--src/rpc/CMakeLists.txt4
-rw-r--r--src/simplewallet/CMakeLists.txt4
-rw-r--r--src/wallet/CMakeLists.txt4
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})