Skip to content

Commit 7054ec3

Browse files
authored
Patch MiniJson with a google namespace (#312)
* Patch MiniJson with a google namespace * Update readme.md
1 parent 2a543dc commit 7054ec3

File tree

3 files changed

+24
-1
lines changed

3 files changed

+24
-1
lines changed

cmake/external/google_minijson.patch

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
diff --git a/MiniJSON.cs b/MiniJSON.cs
2+
index c73cbe5..fcc4397 100644
3+
--- a/MiniJSON.cs
4+
+++ b/MiniJSON.cs
5+
@@ -32,6 +32,7 @@ using System.Collections.Generic;
6+
using System.IO;
7+
using System.Text;
8+
9+
+namespace Google {
10+
namespace MiniJSON {
11+
// Example usage:
12+
//
13+
@@ -562,3 +563,4 @@ namespace MiniJSON {
14+
}
15+
}
16+
}
17+
+}

cmake/external/minijson.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ ExternalProject_Add(
2727

2828
PREFIX ${PROJECT_BINARY_DIR}
2929

30+
PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/google_minijson.patch
31+
3032
CONFIGURE_COMMAND ""
3133
BUILD_COMMAND ""
3234
INSTALL_COMMAND ""
3335
TEST_COMMAND ""
34-
)
36+
)

docs/readme.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,10 @@ Support
155155

156156
Release Notes
157157
-------------
158+
### Upcoming
159+
- Changes
160+
- General: Added a missing namespace to the Google.MiniJson.dll.
161+
158162
### 9.0.0
159163
- Changes
160164
- General: Minimum supported editor version is now Unity 2018.

0 commit comments

Comments
 (0)