From 54d4d81bf459615e49f815a37b21fd269858d4d8 Mon Sep 17 00:00:00 2001
From: Benjamin Sergeant <bsergean@gmail.com>
Date: Sun, 17 May 2020 20:36:17 -0700
Subject: [PATCH] (cmake) make install cmake files optional to not conflict
 with vcpkg

See https://github.com/microsoft/vcpkg/pull/11030
---
 CMakeLists.txt                   | 9 +++++++--
 docs/CHANGELOG.md                | 4 ++++
 ixwebsocket/IXWebSocketVersion.h | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 772b5751..6ad2a099 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -247,8 +247,13 @@ install(TARGETS ixwebsocket EXPORT ixwebsocket
 	PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ixwebsocket/
 )
 
-install(EXPORT ixwebsocket NAMESPACE ixwebsocket:: DESTINATION lib/cmake/ixwebsocket)
-export(EXPORT ixwebsocket NAMESPACE ixwebsocket:: FILE ixwebsocketConfig.cmake)
+# 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()
 
 if (USE_WS OR USE_TEST)
   add_subdirectory(ixcore)
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index aae5a5b0..90d62331 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
 # 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
diff --git a/ixwebsocket/IXWebSocketVersion.h b/ixwebsocket/IXWebSocketVersion.h
index 621d2054..2827dad7 100644
--- a/ixwebsocket/IXWebSocketVersion.h
+++ b/ixwebsocket/IXWebSocketVersion.h
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define IX_WEBSOCKET_VERSION "9.6.1"
+#define IX_WEBSOCKET_VERSION "9.6.2"