diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2017-08-30 16:00:06 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@outlook.com> | 2017-08-30 16:00:06 +0200 |
| commit | 84941bcc9f25cbe3fd3b2604080d0a1cfd8fbaa7 (patch) | |
| tree | aa1648c2ba260b8576673677435481d371eec7b0 /tests | |
| parent | Update core plugins to latest version (#3951) (diff) | |
| download | cuberite-84941bcc9f25cbe3fd3b2604080d0a1cfd8fbaa7.tar cuberite-84941bcc9f25cbe3fd3b2604080d0a1cfd8fbaa7.tar.gz cuberite-84941bcc9f25cbe3fd3b2604080d0a1cfd8fbaa7.tar.bz2 cuberite-84941bcc9f25cbe3fd3b2604080d0a1cfd8fbaa7.tar.lz cuberite-84941bcc9f25cbe3fd3b2604080d0a1cfd8fbaa7.tar.xz cuberite-84941bcc9f25cbe3fd3b2604080d0a1cfd8fbaa7.tar.zst cuberite-84941bcc9f25cbe3fd3b2604080d0a1cfd8fbaa7.zip | |
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/HTTP/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/Network/CMakeLists.txt | 26 |
2 files changed, 16 insertions, 14 deletions
diff --git a/tests/HTTP/CMakeLists.txt b/tests/HTTP/CMakeLists.txt index 5529ed082..32f95a339 100644 --- a/tests/HTTP/CMakeLists.txt +++ b/tests/HTTP/CMakeLists.txt @@ -1,8 +1,8 @@ -enable_testing() +enable_testing() include_directories(${CMAKE_SOURCE_DIR}/src/) include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/lib/libevent/include) -include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/lib/polarssl/include) +include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/lib/mbedtls/include) add_definitions(-DTEST_GLOBALS=1) diff --git a/tests/Network/CMakeLists.txt b/tests/Network/CMakeLists.txt index 617e3ccc9..60c40cdf4 100644 --- a/tests/Network/CMakeLists.txt +++ b/tests/Network/CMakeLists.txt @@ -1,8 +1,8 @@ -enable_testing() +enable_testing() include_directories(${CMAKE_SOURCE_DIR}/src/) include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/lib/libevent/include) -include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/lib/polarssl/include) +include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/lib/mbedtls/include) add_definitions(-DTEST_GLOBALS=1) @@ -18,11 +18,12 @@ set (Network_SRCS ${CMAKE_SOURCE_DIR}/src/OSSupport/NetworkSingleton.cpp ${CMAKE_SOURCE_DIR}/src/OSSupport/ServerHandleImpl.cpp ${CMAKE_SOURCE_DIR}/src/OSSupport/TCPLinkImpl.cpp - ${CMAKE_SOURCE_DIR}/src/PolarSSL++/CtrDrbgContext.cpp - ${CMAKE_SOURCE_DIR}/src/PolarSSL++/CryptoKey.cpp - ${CMAKE_SOURCE_DIR}/src/PolarSSL++/EntropyContext.cpp - ${CMAKE_SOURCE_DIR}/src/PolarSSL++/SslContext.cpp - ${CMAKE_SOURCE_DIR}/src/PolarSSL++/X509Cert.cpp + ${CMAKE_SOURCE_DIR}/src/mbedTLS++/CtrDrbgContext.cpp + ${CMAKE_SOURCE_DIR}/src/mbedTLS++/CryptoKey.cpp + ${CMAKE_SOURCE_DIR}/src/mbedTLS++/EntropyContext.cpp + ${CMAKE_SOURCE_DIR}/src/mbedTLS++/SslConfig.cpp + ${CMAKE_SOURCE_DIR}/src/mbedTLS++/SslContext.cpp + ${CMAKE_SOURCE_DIR}/src/mbedTLS++/X509Cert.cpp ${CMAKE_SOURCE_DIR}/src/StringUtils.cpp ) @@ -39,11 +40,12 @@ set (Network_HDRS ${CMAKE_SOURCE_DIR}/src/OSSupport/ServerHandleImpl.h ${CMAKE_SOURCE_DIR}/src/OSSupport/TCPLinkImpl.h ${CMAKE_SOURCE_DIR}/src/OSSupport/Queue.h - ${CMAKE_SOURCE_DIR}/src/PolarSSL++/CtrDrbgContext.h - ${CMAKE_SOURCE_DIR}/src/PolarSSL++/CryptoKey.h - ${CMAKE_SOURCE_DIR}/src/PolarSSL++/EntropyContext.h - ${CMAKE_SOURCE_DIR}/src/PolarSSL++/SslContext.h - ${CMAKE_SOURCE_DIR}/src/PolarSSL++/X509Cert.h + ${CMAKE_SOURCE_DIR}/src/mbedTLS++/CtrDrbgContext.h + ${CMAKE_SOURCE_DIR}/src/mbedTLS++/CryptoKey.h + ${CMAKE_SOURCE_DIR}/src/mbedTLS++/EntropyContext.h + ${CMAKE_SOURCE_DIR}/src/mbedTLS++/SslConfig.h + ${CMAKE_SOURCE_DIR}/src/mbedTLS++/SslContext.h + ${CMAKE_SOURCE_DIR}/src/mbedTLS++/X509Cert.h ${CMAKE_SOURCE_DIR}/src/StringUtils.h ) |