changed crypto to cncrypto so it generated libcncrypto

fix a cmakelist
This commit is contained in:
Gentian 2017-05-21 02:21:17 -04:00
parent 694470fae7
commit 4b932ff314
14 changed files with 21 additions and 21 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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