Merge branch 'development' into LTS_development

# Conflicts: # CMakeLists.txt
2017-11-01 19:32:52 +01:00 · 2017-11-01 19:32:52 +01:00 · 17baf864d1
commit 17baf864d1
parent f910e3dc04 5e3df09831
6 changed files with 467 additions and 44 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -80,6 +80,9 @@ endif()
 if (DEFINED BIGMETA )
  add_definitions(-DBIGMETA=1)
 endif()
+if (NOT DEFINED NOSSL )
+  add_definitions(-DSSL=1)
+endif()
 if (DEFINED DATASIZE )
  add_definitions(-DSHM_DATASIZE=${DATASIZE})
 endif()
@ -232,6 +235,9 @@ target_link_libraries(mist
  -lpthread 
  ${LIBRT}
 )
+if (NOT DEFINED NOSSL )
+  target_link_libraries(mist mbedtls mbedx509 mbedcrypto)
+endif()
 install(
  FILES ${libHeaders}
  DESTINATION include/mist