From db0b76a59858698874e0b4634ace5886d36dab79 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Wed, 6 Oct 2021 17:53:13 +0200
Subject: [PATCH] CMake changes to use the bundled RapidJSON parser.

---
 CMake/Packages/FindRapidJSON.cmake | 28 ----------------------------
 CMakeLists.txt                     |  3 +--
 2 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 CMake/Packages/FindRapidJSON.cmake

diff --git a/CMake/Packages/FindRapidJSON.cmake b/CMake/Packages/FindRapidJSON.cmake
deleted file mode 100644
index 609c3727b..000000000
--- a/CMake/Packages/FindRapidJSON.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-
-# Find the RapidJSON parsing library.
-#
-# Sets the usual variables expected for find_package scripts:
-#
-# RAPIDJSON_INCLUDE_DIR - header location
-# RAPIDJSON_FOUND - true if RAPIDJSON was found.
-
-include(FindPkgMacros)
-
-if (NOT WIN32)
-  find_package(PkgConfig)
-  pkg_check_modules(RAPIDJSON REQUIRED RapidJSON>=1.0.0)
-endif (NOT WIN32)
-
-if (WIN32)
-  find_path(RAPIDJSON_INCLUDE_DIR rapidjson/rapidjson.h)
-
-# Support the REQUIRED and QUIET arguments, and set RAPIDJSON_FOUND if found.
-include (FindPackageHandleStandardArgs)
-
-find_package_handle_standard_args(RAPIDJSON DEFAULT_MSG RAPIDJSON_INCLUDE_DIR)
-
-if (NOT RAPIDJSON_INCLUDE_DIR)
-  message(FATAL_ERROR "RapidJSON include files not found!")
-endif()
-
-endif (WIN32)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c8ff03b2..08e7418a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,7 +90,6 @@ if(NOT WIN32)
     find_package(FreeImage REQUIRED)
     find_package(Freetype REQUIRED)
     find_package(Pugixml REQUIRED)
-    find_package(RapidJSON REQUIRED)
     find_package(SDL2 REQUIRED)
     if(VLC_PLAYER)
         find_package(VLC REQUIRED)
@@ -243,11 +242,11 @@ set(COMMON_INCLUDE_DIRS ${CURL_INCLUDE_DIR}
                         ${FreeImage_INCLUDE_DIRS}
                         ${FREETYPE_INCLUDE_DIRS}
                         ${PUGIXML_INCLUDE_DIRS}
-                        ${RAPIDJSON_INCLUDE_DIRS}
                         ${SDL2_INCLUDE_DIR}
                         ${CMAKE_CURRENT_SOURCE_DIR}/external/CImg
                         ${CMAKE_CURRENT_SOURCE_DIR}/external/glm
                         ${CMAKE_CURRENT_SOURCE_DIR}/external/nanosvg/src
+                        ${CMAKE_CURRENT_SOURCE_DIR}/external/rapidjson/include
                         ${CMAKE_CURRENT_SOURCE_DIR}/es-core/src)
 if(VLC_PLAYER)
     set(COMMON_INCLUDE_DIRS ${COMMON_INCLUDE_DIRS} ${VLC_INCLUDE_DIR})