From 5f2246eabf242e396fda49cf7239f1fd399b54cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Guilloux?= <glx22@users.noreply.github.com>
Date: Thu, 6 Jul 2023 11:49:06 +0200
Subject: [PATCH] Fix 021c45c: [CMake] detection and use of nlohmann-json for
 emscripten (#11113)

---
 .github/workflows/ci-build.yml              | 3 ++-
 .github/workflows/preview_build.yml         | 3 ++-
 os/emscripten/cmake/Findnlohmann_json.cmake | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 6ddb2e5901..1baf2c7e9a 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -32,10 +32,11 @@ jobs:
         path: /emsdk/upstream/emscripten/cache
         key: 3.1.37-${{ runner.os }}
 
-    - name: Patch Emscripten to support LZMA
+    - name: Patch Emscripten to support LZMA and nlohmann-json
       run: |
         cd /emsdk/upstream/emscripten
         patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-liblzma.patch
+        patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-nlohmann-json.patch
 
     - name: Build (host tools)
       run: |
diff --git a/.github/workflows/preview_build.yml b/.github/workflows/preview_build.yml
index b73d993665..773b8ce3de 100644
--- a/.github/workflows/preview_build.yml
+++ b/.github/workflows/preview_build.yml
@@ -47,10 +47,11 @@ jobs:
         path: /emsdk/upstream/emscripten/cache
         key: 3.1.37-${{ runner.os }}
 
-    - name: Patch Emscripten to support LZMA
+    - name: Patch Emscripten to support LZMA and nlohmann_json
       run: |
         cd /emsdk/upstream/emscripten
         patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-liblzma.patch
+        patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-nlohmann-json.patch
 
     - name: Build (host tools)
       run: |
diff --git a/os/emscripten/cmake/Findnlohmann_json.cmake b/os/emscripten/cmake/Findnlohmann_json.cmake
index 6ff84544da..7e863a7cf8 100644
--- a/os/emscripten/cmake/Findnlohmann_json.cmake
+++ b/os/emscripten/cmake/Findnlohmann_json.cmake
@@ -6,10 +6,10 @@ set(CMAKE_REQUIRED_FLAGS "-sUSE_NLOHMANN_JSON=1")
 check_cxx_source_compiles("
     #include <nlohmann/json.hpp>
     int main() { return 0; }"
-    NLOHMANN_JSON_FOUND
+    nlohmann_json_FOUND
 )
 
-if (NLOHMANN_JSON_FOUND)
+if (nlohmann_json_FOUND)
         add_library(nlohmann_json INTERFACE IMPORTED)
         set_target_properties(nlohmann_json PROPERTIES
                 INTERFACE_COMPILE_OPTIONS "-sUSE_NLOHMANN_JSON=1"