(windows + tls) mbedtls is the default windows tls backend + add ability to load system certificates with mbdetls on windows

CMakeLists.txt

@@ -247,13 +247,8 @@ install(TARGETS ixwebsocket EXPORT ixwebsocket
 	PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ixwebsocket/
 )
 
-# This gets in the way of vcpkg in ways I do not know how to fix
-# https://github.com/microsoft/vcpkg/pull/11030
-# Maybe using vcpkg_fixup_cmake_targets could fix it
-if (INSTALL_CMAKE_FILE)
-  install(EXPORT ixwebsocket NAMESPACE ixwebsocket:: DESTINATION lib/cmake/ixwebsocket)
-  export(EXPORT ixwebsocket NAMESPACE ixwebsocket:: FILE ixwebsocketConfig.cmake)
-endif()
+install(EXPORT ixwebsocket NAMESPACE ixwebsocket:: DESTINATION lib/cmake/ixwebsocket)
+export(EXPORT ixwebsocket NAMESPACE ixwebsocket:: FILE ixwebsocketConfig.cmake)
 
 if (USE_WS OR USE_TEST)
   add_subdirectory(ixcore)

README.md

@@ -45,7 +45,7 @@ IXWebSocket client code is autobahn compliant beginning with the 6.0.0 version.
 If your company or project is using this library, feel free to open an issue or PR to amend this list.
 
 - [Machine Zone](https://www.mz.com)
-- [Tokio](https://gitlab.com/HCInk/tokio), a discord library focused on audio playback with node bindings.
+- [dis-light](https://gitlab.com/HCInk/dis-light), a discord library with a node frontend.
 - [libDiscordBot](https://github.com/tostc/libDiscordBot/tree/master), a work in progress discord library
 - [gwebsocket](https://github.com/norrbotten/gwebsocket), a websocket (lua) module for Garry's Mod
 - [DisCPP](https://github.com/DisCPP/DisCPP), a simple but feature rich Discord API wrapper

docs/CHANGELOG.md

@@ -1,10 +1,6 @@
 # Changelog
 All changes to this project will be documented in this file.
 
-## [9.6.2] - 2020-05-17
-
-(cmake) make install cmake files optional to not conflict with vcpkg
-
 ## [9.6.1] - 2020-05-17
 
 (windows + tls) mbedtls is the default windows tls backend + add ability to load system certificates with mbdetls on windows

ixwebsocket/IXWebSocketVersion.h

@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define IX_WEBSOCKET_VERSION "9.6.2"
+#define IX_WEBSOCKET_VERSION "9.6.1"