From 4b932ff3148550fd3e9cf07fccb807a9cdde59ef Mon Sep 17 00:00:00 2001
From: Gentian <gkruja2@gmail.com>
Date: Sun, 21 May 2017 02:21:17 -0400
Subject: [PATCH] changed crypto to cncrypto so it generated libcncrypto
fix a cmakelist
---
src/blockchain_db/CMakeLists.txt | 2 +-
src/common/CMakeLists.txt | 2 +-
src/crypto/CMakeLists.txt | 6 +++---
src/cryptonote_basic/CMakeLists.txt | 2 +-
src/cryptonote_core/CMakeLists.txt | 2 +-
src/daemon/CMakeLists.txt | 2 +-
src/ringct/CMakeLists.txt | 2 +-
src/simplewallet/CMakeLists.txt | 2 +-
src/wallet/CMakeLists.txt | 4 ++--
tests/crypto/CMakeLists.txt | 10 +++++-----
tests/daemon_tests/CMakeLists.txt | 2 +-
tests/functional_tests/CMakeLists.txt | 2 +-
tests/hash/CMakeLists.txt | 2 +-
tests/performance_tests/CMakeLists.txt | 2 +-
14 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/blockchain_db/CMakeLists.txt b/src/blockchain_db/CMakeLists.txt
index c27aa73b0..041d9568f 100644
--- a/src/blockchain_db/CMakeLists.txt
+++ b/src/blockchain_db/CMakeLists.txt
@@ -62,7 +62,7 @@ monero_add_library(blockchain_db
target_link_libraries(blockchain_db
PUBLIC
common
- crypto
+ cncrypto
ringct
${LMDB_LIBRARY}
${BDB_LIBRARY}
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 0a3e8cd19..55b8ad3e6 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -79,7 +79,7 @@ monero_add_library(common
target_link_libraries(common
PUBLIC
epee
- crypto
+ cncrypto
${UNBOUND_LIBRARY}
${LIBUNWIND_LIBRARIES}
${Boost_DATE_TIME_LIBRARY}
diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
index 277ee64c2..1e06a0dfd 100644
--- a/src/crypto/CMakeLists.txt
+++ b/src/crypto/CMakeLists.txt
@@ -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
diff --git a/src/cryptonote_basic/CMakeLists.txt b/src/cryptonote_basic/CMakeLists.txt
index 2b8ad365a..ec7aa251f 100644
--- a/src/cryptonote_basic/CMakeLists.txt
+++ b/src/cryptonote_basic/CMakeLists.txt
@@ -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}
diff --git a/src/cryptonote_core/CMakeLists.txt b/src/cryptonote_core/CMakeLists.txt
index 5944ddcd1..7c43323d4 100644
--- a/src/cryptonote_core/CMakeLists.txt
+++ b/src/cryptonote_core/CMakeLists.txt
@@ -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}
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
index 649823a59..795442a2d 100644
--- a/src/daemon/CMakeLists.txt
+++ b/src/daemon/CMakeLists.txt
@@ -87,7 +87,7 @@ target_link_libraries(daemon
rpc
blockchain_db
cryptonote_core
- crypto
+ cncrypto
common
p2p
cryptonote_protocol
diff --git a/src/ringct/CMakeLists.txt b/src/ringct/CMakeLists.txt
index e15af205a..f9862ac80 100644
--- a/src/ringct/CMakeLists.txt
+++ b/src/ringct/CMakeLists.txt
@@ -48,7 +48,7 @@ monero_add_library(ringct
target_link_libraries(ringct
PUBLIC
common
- crypto
+ cncrypto
cryptonote_basic
PRIVATE
${EXTRA_LIBRARIES})
diff --git a/src/simplewallet/CMakeLists.txt b/src/simplewallet/CMakeLists.txt
index 18a8bac68..443e9b87e 100644
--- a/src/simplewallet/CMakeLists.txt
+++ b/src/simplewallet/CMakeLists.txt
@@ -45,7 +45,7 @@ target_link_libraries(simplewallet
wallet
rpc
cryptonote_core
- crypto
+ cncrypto
common
mnemonics
p2p
diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
index 2e7610b64..639080051 100644
--- a/src/wallet/CMakeLists.txt
+++ b/src/wallet/CMakeLists.txt
@@ -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
diff --git a/tests/crypto/CMakeLists.txt b/tests/crypto/CMakeLists.txt
index e1c632a00..573c62ad4 100644
--- a/tests/crypto/CMakeLists.txt
+++ b/tests/crypto/CMakeLists.txt
@@ -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")
diff --git a/tests/daemon_tests/CMakeLists.txt b/tests/daemon_tests/CMakeLists.txt
index c6dc69e9d..b554bfec8 100644
--- a/tests/daemon_tests/CMakeLists.txt
+++ b/tests/daemon_tests/CMakeLists.txt
@@ -39,7 +39,7 @@ target_link_libraries(transfers
useragent
rpc
cryptonote_core
- crypto
+ cncrypto
common
epee
${GTEST_LIBRARIES})
diff --git a/tests/functional_tests/CMakeLists.txt b/tests/functional_tests/CMakeLists.txt
index 166476904..498fe3c2c 100644
--- a/tests/functional_tests/CMakeLists.txt
+++ b/tests/functional_tests/CMakeLists.txt
@@ -43,7 +43,7 @@ target_link_libraries(functional_tests
cryptonote_core
wallet
common
- crypto
+ cncrypto
epee
${Boost_REGEX_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
diff --git a/tests/hash/CMakeLists.txt b/tests/hash/CMakeLists.txt
index 0f579cc6a..5cc95efbb 100644
--- a/tests/hash/CMakeLists.txt
+++ b/tests/hash/CMakeLists.txt
@@ -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
diff --git a/tests/performance_tests/CMakeLists.txt b/tests/performance_tests/CMakeLists.txt
index 7845515de..2b3a0d6f8 100644
--- a/tests/performance_tests/CMakeLists.txt
+++ b/tests/performance_tests/CMakeLists.txt
@@ -53,7 +53,7 @@ target_link_libraries(performance_tests
PRIVATE
cryptonote_core
common
- crypto
+ cncrypto
epee
${Boost_CHRONO_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}