Skip to content

Commit 5c0d6b5

Browse files
committed
Replace cJSON by nlohmann::ordered_json
Using ordered version to better mimic old behavior which keeps insertion order
1 parent 66fbd46 commit 5c0d6b5

File tree

9 files changed

+238
-417
lines changed

9 files changed

+238
-417
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
[submodule "cc-wrapper"]
55
path = submodules/cc-wrapper
66
url = https://github.com/eranif/cc-wrapper
7-
[submodule "submodules/cJSON"]
8-
path = submodules/cJSON
9-
url = https://github.com/DaveGamble/cJSON
107
[submodule "submodules/doctest"]
118
path = submodules/doctest
129
url = https://github.com/doctest/doctest

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,6 @@ endif()
988988
add_subdirectory(submodules/lexilla)
989989
990990
add_subdirectory(submodules)
991-
include_directories(submodules/cJSON)
992991
993992
add_subdirectory(sdk/wxsqlite3)
994993
add_subdirectory(sdk/databaselayer)

CodeLite/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@ target_link_libraries(
9797
${GTK_LIBS}
9898
${ADDITIONAL_LIBRARIES}
9999
${LIBUCHARDET_LIB}
100-
assistantlib
101-
cJSON)
100+
assistantlib)
102101

103102
if(MINGW)
104103
set_target_properties(

0 commit comments

Comments
 (0)