monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 00:37:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1139

Browse source 
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)
This commit is contained in:
Riccardo Spagni 2016-10-04 12:11:03 +02:00
commit 4cb1348548
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
15 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/CMakeLists.txt
View file

@ -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})

4
src/blockchain_db/CMakeLists.txt
View file

@ -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})

8
src/blockchain_utilities/CMakeLists.txt
View file

@ -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})

6
src/common/CMakeLists.txt
View file

@ -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})

4
src/crypto/CMakeLists.txt
View file

@ -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})

4
src/cryptonote_core/CMakeLists.txt
View file

@ -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})

6
src/cryptonote_protocol/CMakeLists.txt
View file

@ -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})

4
src/daemon/CMakeLists.txt
View file

@ -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}

4
src/daemonizer/CMakeLists.txt
View file

@ -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})

4
src/mnemonics/CMakeLists.txt
View file

@ -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})

6
src/p2p/CMakeLists.txt
View file

@ -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}

4
src/ringct/CMakeLists.txt
View file

@ -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})

4
src/rpc/CMakeLists.txt
View file

@ -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})

4
src/simplewallet/CMakeLists.txt
View file

@ -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})

4
src/wallet/CMakeLists.txt
View file

@ -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})