summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2017-08-30 16:00:06 +0200
committerTiger Wang <ziwei.tiger@outlook.com>2017-08-30 16:00:06 +0200
commit84941bcc9f25cbe3fd3b2604080d0a1cfd8fbaa7 (patch)
treeaa1648c2ba260b8576673677435481d371eec7b0 /lib
parentUpdate core plugins to latest version (#3951) (diff)
downloadcuberite-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 'lib')
m---------lib/mbedtls0
-rw-r--r--lib/mbedtls.cmake (renamed from lib/polarssl.cmake)6
m---------lib/polarssl0
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/mbedtls b/lib/mbedtls
new file mode 160000
+Subproject f2a597fa3dd1c7b15e0fee62f6932b253295803
diff --git a/lib/polarssl.cmake b/lib/mbedtls.cmake
index 3506d0fb4..c33ed8959 100644
--- a/lib/polarssl.cmake
+++ b/lib/mbedtls.cmake
@@ -1,10 +1,10 @@
-
+
# This script includes PolarSSL, if not already included.
# It is needed for when multiple projects reference PolarSSL.
if(NOT TARGET mbedtls)
- message("including polarssl")
+ message("including mbedtls")
set(ENABLE_TESTING OFF CACHE BOOL "Disable tests")
set(ENABLE_PROGRAMS OFF CACHE BOOL "Disable programs")
- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/polarssl/ ${CMAKE_CURRENT_BINARY_DIR}/lib/polarssl EXCLUDE_FROM_ALL)
+ add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/mbedtls/ ${CMAKE_CURRENT_BINARY_DIR}/lib/mbedtls EXCLUDE_FROM_ALL)
endif()
diff --git a/lib/polarssl b/lib/polarssl
deleted file mode 160000
-Subproject 4f4c5b7450631e46a94cb89adf4a7737fbb178b