aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-05-30 21:24:11 +0200
committerRiccardo Spagni <ric@spagni.net>2017-05-30 21:24:11 +0200
commita4c13ea09289a2703457467171c84e7ff16fc380 (patch)
treeff139e81887afe74150df0f58a3877a560f9cef2 /tests
parentMerge pull request #2038 (diff)
parentchanged crypto to cncrypto so it generated libcncrypto (diff)
downloadmonero-a4c13ea09289a2703457467171c84e7ff16fc380.tar.xz
Merge pull request #2039
4b932ff3 changed crypto to cncrypto so it generated libcncrypto (Gentian)
Diffstat (limited to 'tests')
-rw-r--r--tests/crypto/CMakeLists.txt10
-rw-r--r--tests/daemon_tests/CMakeLists.txt2
-rw-r--r--tests/functional_tests/CMakeLists.txt2
-rw-r--r--tests/hash/CMakeLists.txt2
-rw-r--r--tests/performance_tests/CMakeLists.txt2
5 files changed, 9 insertions, 9 deletions
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}