summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Bell <peterbell10@live.co.uk>2020-07-06 21:08:41 +0200
committerTiger Wang <ziwei.tiger@outlook.com>2020-07-06 21:53:04 +0200
commitad935ef40fa18a2de08df9cc7e6161ad23adfcb0 (patch)
treeb88f32eec2c4e33ea8e32d9d1783377010dfed8e
parentUpdate fmtlib to 7.0.0 (diff)
downloadcuberite-ad935ef40fa18a2de08df9cc7e6161ad23adfcb0.tar
cuberite-ad935ef40fa18a2de08df9cc7e6161ad23adfcb0.tar.gz
cuberite-ad935ef40fa18a2de08df9cc7e6161ad23adfcb0.tar.bz2
cuberite-ad935ef40fa18a2de08df9cc7e6161ad23adfcb0.tar.lz
cuberite-ad935ef40fa18a2de08df9cc7e6161ad23adfcb0.tar.xz
cuberite-ad935ef40fa18a2de08df9cc7e6161ad23adfcb0.tar.zst
cuberite-ad935ef40fa18a2de08df9cc7e6161ad23adfcb0.zip
Diffstat (limited to '')
-rw-r--r--CMakeLists.txt2
m---------lib/libevent0
-rw-r--r--tests/HTTP/CMakeLists.txt1
-rw-r--r--tests/Network/CMakeLists.txt1
4 files changed, 0 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b0ce4afa..9f58696fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -232,8 +232,6 @@ endif()
# Add required includes:
target_include_directories(
${CMAKE_PROJECT_NAME} SYSTEM PRIVATE
- ${CMAKE_CURRENT_BINARY_DIR}/lib/libevent/include # TODO: remove when updating libevent
- lib/libevent/include
lib/mbedtls/include
lib/TCLAP/include
lib # TODO fix files including zlib/x instead of x
diff --git a/lib/libevent b/lib/libevent
-Subproject 4c908dde58ef780eeefcc9df4db3063ca62ea86
+Subproject 5df3037d10556bfcb675bc73e516978b75fc7bc
diff --git a/tests/HTTP/CMakeLists.txt b/tests/HTTP/CMakeLists.txt
index a32355d95..d252801c0 100644
--- a/tests/HTTP/CMakeLists.txt
+++ b/tests/HTTP/CMakeLists.txt
@@ -1,5 +1,4 @@
include_directories(${CMAKE_SOURCE_DIR}/src/)
-include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/lib/libevent/include)
include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/lib/mbedtls/include)
# Create a single HTTP library that contains all the HTTP code:
diff --git a/tests/Network/CMakeLists.txt b/tests/Network/CMakeLists.txt
index 0fe639ba4..12759558e 100644
--- a/tests/Network/CMakeLists.txt
+++ b/tests/Network/CMakeLists.txt
@@ -1,5 +1,4 @@
include_directories(${CMAKE_SOURCE_DIR}/src/)
-include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/lib/libevent/include)
include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/lib/mbedtls/include)
# Create a single Network library that contains all the networking code: