From 2cccc9898b4bebc7e5ca56e86711324c694ff505 Mon Sep 17 00:00:00 2001
From: Darren Harton <dharton@carnegierobotics.com>
Date: Thu, 16 Apr 2020 14:44:19 -0400
Subject: [PATCH 1/3] added Oatpp-Websocket

---
 CMakeLists.txt                            |  5 +++++
 cmake/OatppWebSocketExternalProject.cmake | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 cmake/OatppWebSocketExternalProject.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8cd34fb..29771ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,3 +92,8 @@ option(ROBOT_FARM_BUILD_OATPP "Build oatpp" OFF)
 if (ROBOT_FARM_BUILD_ALL OR ROBOT_FARM_BUILD_OATPP)
     include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/OatppExternalProject.cmake)
 endif ()
+
+option(ROBOT_FARM_BUILD_OATPP_WEBSOCKET "Build oatpp websocket" OFF)
+if (ROBOT_FARM_BUILD_ALL OR ROBOT_FARM_BUILD_OATPP_WEBSOCKET)
+    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/OatppWebSocketExternalProject.cmake)
+endif ()
diff --git a/cmake/OatppWebSocketExternalProject.cmake b/cmake/OatppWebSocketExternalProject.cmake
new file mode 100644
index 0000000..3958d60
--- /dev/null
+++ b/cmake/OatppWebSocketExternalProject.cmake
@@ -0,0 +1,21 @@
+#[[ CMake guard. ]]
+if(TARGET OatppExternalProject)
+    return()
+endif()
+
+include(ExternalProject)
+
+set(ROBOT_FARM_OATPP_WEBSOCKET_URL
+        "https://github.com/oatpp/oatpp-websocket/archive/1.0.0.zip"
+        CACHE STRING
+        "URL of the oatpp source archive")
+
+externalproject_add(OatppWebsocketExternalProject
+        PREFIX ${CMAKE_CURRENT_BINARY_DIR}/oatpp
+        URL ${ROBOT_FARM_OATPP_WEBSOCKET_URL}
+        DOWNLOAD_NO_PROGRESS ON
+        CMAKE_ARGS
+        -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+        -DCMAKE_PREFIX_PATH:PATH=${CMAKE_INSTALL_PREFIX}
+        -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
+        -DBUILD_SHARED_LIBS:BOOL=ON)

From 8bf329ab882193e5ab05adf16413a872d98a9f3c Mon Sep 17 00:00:00 2001
From: Darren Harton <dharton@carnegierobotics.com>
Date: Thu, 16 Apr 2020 17:15:46 -0400
Subject: [PATCH 2/3] set oatpp dependency on oatpp-websocket

---
 cmake/OatppWebSocketExternalProject.cmake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cmake/OatppWebSocketExternalProject.cmake b/cmake/OatppWebSocketExternalProject.cmake
index 3958d60..a71ccaa 100644
--- a/cmake/OatppWebSocketExternalProject.cmake
+++ b/cmake/OatppWebSocketExternalProject.cmake
@@ -1,9 +1,10 @@
 #[[ CMake guard. ]]
-if(TARGET OatppExternalProject)
+if(TARGET OatppWebsocketExternalProject)
     return()
 endif()
 
 include(ExternalProject)
+include(${CMAKE_CURRENT_LIST_DIR}/OatppExternalProject.cmake)
 
 set(ROBOT_FARM_OATPP_WEBSOCKET_URL
         "https://github.com/oatpp/oatpp-websocket/archive/1.0.0.zip"
@@ -19,3 +20,5 @@ externalproject_add(OatppWebsocketExternalProject
         -DCMAKE_PREFIX_PATH:PATH=${CMAKE_INSTALL_PREFIX}
         -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
         -DBUILD_SHARED_LIBS:BOOL=ON)
+
+add_dependencies(OatppWebsocketExternalProject OatppExternalProject)

From 1defbbb9439a528f4f12c658db111397a55dc0a1 Mon Sep 17 00:00:00 2001
From: Darren Harton <dharton@carnegierobotics.com>
Date: Mon, 20 Apr 2020 09:35:51 -0400
Subject: [PATCH 3/3] addressed comments

---
 cmake/OatppWebSocketExternalProject.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/OatppWebSocketExternalProject.cmake b/cmake/OatppWebSocketExternalProject.cmake
index a71ccaa..9c95aad 100644
--- a/cmake/OatppWebSocketExternalProject.cmake
+++ b/cmake/OatppWebSocketExternalProject.cmake
@@ -9,10 +9,10 @@ include(${CMAKE_CURRENT_LIST_DIR}/OatppExternalProject.cmake)
 set(ROBOT_FARM_OATPP_WEBSOCKET_URL
         "https://github.com/oatpp/oatpp-websocket/archive/1.0.0.zip"
         CACHE STRING
-        "URL of the oatpp source archive")
+        "URL of the oatpp-websocket source archive")
 
 externalproject_add(OatppWebsocketExternalProject
-        PREFIX ${CMAKE_CURRENT_BINARY_DIR}/oatpp
+        PREFIX ${CMAKE_CURRENT_BINARY_DIR}/oatpp-websocket
         URL ${ROBOT_FARM_OATPP_WEBSOCKET_URL}
         DOWNLOAD_NO_PROGRESS ON
         CMAKE_ARGS