summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
m---------lib/SQLiteCpp0
m---------lib/libevent0
m---------lib/polarssl0
-rw-r--r--lib/polarssl.cmake11
4 files changed, 5 insertions, 6 deletions
diff --git a/lib/SQLiteCpp b/lib/SQLiteCpp
-Subproject 55edadd56d0d6f506954ad00c3b9a5d425814a2
+Subproject b17195b8d03e8908807c51f4d6ce610b148fc1b
diff --git a/lib/libevent b/lib/libevent
-Subproject 62eaa889cc1996a7c58a389bf2dfa5d8ce784bd
+Subproject de2bb6568c930f76a5bc41ef6e0bf35a8a826e6
diff --git a/lib/polarssl b/lib/polarssl
-Subproject 38f47a8546b55e2b593bba27f03070e1e82d3c8
+Subproject 4f4c5b7450631e46a94cb89adf4a7737fbb178b
diff --git a/lib/polarssl.cmake b/lib/polarssl.cmake
index ced70b94e..3506d0fb4 100644
--- a/lib/polarssl.cmake
+++ b/lib/polarssl.cmake
@@ -1,11 +1,10 @@
-if(NOT TARGET polarssl)
+# This script includes PolarSSL, if not already included.
+# It is needed for when multiple projects reference PolarSSL.
+
+if(NOT TARGET mbedtls)
message("including polarssl")
set(ENABLE_TESTING OFF CACHE BOOL "Disable tests")
set(ENABLE_PROGRAMS OFF CACHE BOOL "Disable programs")
- if (SELF_TEST)
- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/polarssl/ ${CMAKE_CURRENT_BINARY_DIR}/lib/polarssl)
- else()
- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/polarssl/ ${CMAKE_CURRENT_BINARY_DIR}/lib/polarssl EXCLUDE_FROM_ALL)
- endif()
+ add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/polarssl/ ${CMAKE_CURRENT_BINARY_DIR}/lib/polarssl EXCLUDE_FROM_ALL)
endif()