kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2039

Browse source 
4b932ff3 changed crypto to cncrypto so it generated libcncrypto (Gentian)
This commit is contained in:
Riccardo Spagni 2017-05-30 21:24:11 +02:00
commit a4c13ea092
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
14 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/blockchain_db/CMakeLists.txt
View file

@ -62,7 +62,7 @@ monero_add_library(blockchain_db
target_link_libraries(blockchain_db target_link_libraries(blockchain_db
PUBLIC PUBLIC
common common
crypto cncrypto
ringct ringct
${LMDB_LIBRARY} ${LMDB_LIBRARY}
${BDB_LIBRARY} ${BDB_LIBRARY}

2
src/common/CMakeLists.txt
View file

@ -79,7 +79,7 @@ monero_add_library(common
target_link_libraries(common target_link_libraries(common
PUBLIC PUBLIC
epee epee
crypto cncrypto
${UNBOUND_LIBRARY} ${UNBOUND_LIBRARY}
${LIBUNWIND_LIBRARIES} ${LIBUNWIND_LIBRARIES}
${Boost_DATE_TIME_LIBRARY} ${Boost_DATE_TIME_LIBRARY}

6
src/crypto/CMakeLists.txt
View file

@ -68,13 +68,13 @@ set(crypto_private_headers
skein.h skein.h
skein_port.h) skein_port.h)
monero_private_headers(crypto monero_private_headers(cncrypto
${crypto_private_headers}) ${crypto_private_headers})
monero_add_library(crypto monero_add_library(cncrypto
${crypto_sources} ${crypto_sources}
${crypto_headers} ${crypto_headers}
${crypto_private_headers}) ${crypto_private_headers})
target_link_libraries(crypto target_link_libraries(cncrypto
PUBLIC PUBLIC
${Boost_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
PRIVATE PRIVATE

2
src/cryptonote_basic/CMakeLists.txt
View file

@ -62,7 +62,7 @@ monero_add_library(cryptonote_basic
target_link_libraries(cryptonote_basic target_link_libraries(cryptonote_basic
PUBLIC PUBLIC
common common
crypto cncrypto
${Boost_DATE_TIME_LIBRARY} ${Boost_DATE_TIME_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_SERIALIZATION_LIBRARY} ${Boost_SERIALIZATION_LIBRARY}

2
src/cryptonote_core/CMakeLists.txt
View file

@ -56,7 +56,7 @@ monero_add_library(cryptonote_core
target_link_libraries(cryptonote_core target_link_libraries(cryptonote_core
PUBLIC PUBLIC
common common
crypto cncrypto
blockchain_db blockchain_db
ringct ringct
${Boost_DATE_TIME_LIBRARY} ${Boost_DATE_TIME_LIBRARY}

2
src/daemon/CMakeLists.txt
View file

@ -87,7 +87,7 @@ target_link_libraries(daemon
rpc rpc
blockchain_db blockchain_db
cryptonote_core cryptonote_core
crypto cncrypto
common common
p2p p2p
cryptonote_protocol cryptonote_protocol

2
src/ringct/CMakeLists.txt
View file

@ -48,7 +48,7 @@ monero_add_library(ringct
target_link_libraries(ringct target_link_libraries(ringct
PUBLIC PUBLIC
common common
crypto cncrypto
cryptonote_basic cryptonote_basic
PRIVATE PRIVATE
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})

2
src/simplewallet/CMakeLists.txt
View file

@ -45,7 +45,7 @@ target_link_libraries(simplewallet
wallet wallet
rpc rpc
cryptonote_core cryptonote_core
crypto cncrypto
common common
mnemonics mnemonics
p2p p2p

4
src/wallet/CMakeLists.txt
View file

@ -108,7 +108,7 @@ if (NOT BUILD_GUI_DEPS)
epee epee
rpc rpc
cryptonote_core cryptonote_core
crypto cncrypto
common common
${Boost_CHRONO_LIBRARY} ${Boost_CHRONO_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}
@ -126,7 +126,7 @@ endif()
# build and install libwallet_merged only if we building for GUI # build and install libwallet_merged only if we building for GUI
if (BUILD_GUI_DEPS) if (BUILD_GUI_DEPS)
set(libs_to_merge wallet cryptonote_core cryptonote_basic mnemonics common crypto ringct) set(libs_to_merge wallet cryptonote_core cryptonote_basic mnemonics common cncrypto ringct)
foreach(lib ${libs_to_merge}) foreach(lib ${libs_to_merge})
list(APPEND objlibs $<TARGET_OBJECTS:obj_${lib}>) # matches naming convention in src/CMakeLists.txt list(APPEND objlibs $<TARGET_OBJECTS:obj_${lib}>) # matches naming convention in src/CMakeLists.txt

10
tests/crypto/CMakeLists.txt
View file

@ -37,17 +37,17 @@ set(crypto_sources
set(crypto_headers set(crypto_headers
crypto-tests.h) crypto-tests.h)
add_executable(crypto-tests add_executable(cncrypto-tests
${crypto_sources} ${crypto_sources}
${crypto_headers}) ${crypto_headers})
target_link_libraries(crypto-tests target_link_libraries(cncrypto-tests
PRIVATE PRIVATE
${Boost_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
set_property(TARGET crypto-tests set_property(TARGET cncrypto-tests
PROPERTY PROPERTY
FOLDER "tests") FOLDER "tests")
add_test( add_test(
NAME crypto NAME cncrypto
COMMAND crypto-tests "${CMAKE_CURRENT_SOURCE_DIR}/tests.txt") COMMAND cncrypto-tests "${CMAKE_CURRENT_SOURCE_DIR}/tests.txt")

2
tests/daemon_tests/CMakeLists.txt
View file

@ -39,7 +39,7 @@ target_link_libraries(transfers
useragent useragent
rpc rpc
cryptonote_core cryptonote_core
crypto cncrypto
common common
epee epee
${GTEST_LIBRARIES}) ${GTEST_LIBRARIES})

2
tests/functional_tests/CMakeLists.txt
View file

@ -43,7 +43,7 @@ target_link_libraries(functional_tests
cryptonote_core cryptonote_core
wallet wallet
common common
crypto cncrypto
epee epee
${Boost_REGEX_LIBRARY} ${Boost_REGEX_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}

2
tests/hash/CMakeLists.txt
View file

@ -36,7 +36,7 @@ add_executable(hash-tests
${hash_headers}) ${hash_headers})
target_link_libraries(hash-tests target_link_libraries(hash-tests
PRIVATE PRIVATE
crypto cncrypto
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
set_property(TARGET hash-tests set_property(TARGET hash-tests
PROPERTY PROPERTY

2
tests/performance_tests/CMakeLists.txt
View file

@ -53,7 +53,7 @@ target_link_libraries(performance_tests
PRIVATE PRIVATE
cryptonote_core cryptonote_core
common common
crypto cncrypto
epee epee
${Boost_CHRONO_LIBRARY} ${Boost_CHRONO_LIBRARY}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}