From 6270df021d1675690db1115d6c75c938296e58e4 Mon Sep 17 00:00:00 2001
From: Jonathan Glanz <jonathan.glanz@gmail.com>
Date: Sun, 21 Sep 2025 11:33:12 -0400
Subject: [PATCH 1/2] Removed submodule external/rapidjson

---
 .gitmodules        | 6 +++---
 external/rapidjson | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 160000 external/rapidjson

diff --git a/.gitmodules b/.gitmodules
index e2e4c10..3b31f93 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "external/rapidjson"]
-	path = external/rapidjson
-	url = https://github.com/Wire-Network/rapidjson.git
+; [submodule "external/rapidjson"]
+; 	path = external/rapidjson
+; 	url = https://github.com/Wire-Network/rapidjson.git
 [submodule "external/wirejs-native"]
 	path = external/wirejs-native
 	url = https://github.com/Wire-Network/wirejs-native
diff --git a/external/rapidjson b/external/rapidjson
deleted file mode 160000
index 476ffa2..0000000
--- a/external/rapidjson
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 476ffa2fd272243275a74c36952f210267dc3088

From d6645647d3e95cfefd5ec97de2325eec895d14f7 Mon Sep 17 00:00:00 2001
From: Jonathan Glanz <jonathan.glanz@gmail.com>
Date: Sun, 21 Sep 2025 11:49:45 -0400
Subject: [PATCH 2/2] OPS-15 OPS-42: Additional cleanup & fixes for `vcpkg`
 support

- removed `rapidjson`
- added vcpkg zlib
- added vcpkg gmp
- added vcpkg catch2
- added vcpkg prometheus-cpp
---
 CMakeLists.txt | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0fd18e..2481100 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,13 @@
 cmake_minimum_required (VERSION 3.8)
 project(abieos VERSION 0.1 LANGUAGES CXX C)
 
+if (NOT TARGET rapidjson)
+    find_package(RapidJSON REQUIRED)
+    if(NOT TARGET rapidjson)
+        message(FATAL_ERROR "RapidJSON not found!")
+    endif()
+endif()
+
 set(default_build_type "Release")
 
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
@@ -38,9 +45,10 @@ include(GNUInstallDirs)
 add_library(abieos STATIC src/abi.cpp src/crypto.cpp include/sysio/fpconv.c)
 target_include_directories(abieos PUBLIC 
                           "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/include" 
-                          "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/external/rapidjson/include"
                           "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
 
+target_link_libraries(abieos rapidjson)
+
 if(ABIEOS_NO_INT128)
 target_compile_definitions(abieos PUBLIC ABIEOS_NO_INT128)
 endif()
@@ -48,10 +56,10 @@ endif()
 add_library(abieos_module MODULE src/abieos.cpp src/abi.cpp src/crypto.cpp include/sysio/fpconv.c)
 target_include_directories(abieos_module PUBLIC 
                           "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/include;" 
-                          "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/external/rapidjson/include" 
+
                           "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
 
-target_link_libraries(abieos_module ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(abieos_module ${CMAKE_THREAD_LIBS_INIT} rapidjson)
 set_target_properties(abieos_module PROPERTIES OUTPUT_NAME "abieos")
 
 enable_testing()