mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix: [Emscripten] actually link against nlohmann_json (#11120) 

We fake a plain (non-scoped) library, but we don't actually set
the library to anything valid. In result, it is never actually
linked.
This commit is contained in:
Patric Stout 2023-07-07 23:21:43 +02:00 committed by GitHub
parent c236ff356d
commit 153323a4c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
os/emscripten/cmake/Findnlohmann_json.cmake
View File

@ -15,6 +15,7 @@ if (nlohmann_json_FOUND)
INTERFACE_COMPILE_OPTIONS "-sUSE_NLOHMANN_JSON=1"
INTERFACE_LINK_LIBRARIES "-sUSE_NLOHMANN_JSON=1"
)
set(nlohmann_json_LIBRARY "nlohmann_json")
else()
message(WARNING "You are using an emscripten SDK without nlohmann-json support. Please apply 'emsdk-nlohmann_json.patch' to your local emsdk installation.")
endif()