Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use submodule for cJSON (Codelite uses old untagged version, recent o… #3479

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use submodule for cJSON (Codelite uses old untagged version, recent o… #3479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@
[submodule "submodules/asio"]
path = submodules/asio
url = https://github.com/chriskohlhoff/asio.git
[submodule "submodules/cJSON"]
path = submodules/cJSON
url = https://github.com/DaveGamble/cJSON
11 changes: 3 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,6 @@ else(APPLE)
set(WX_COMPONENTS "std aui propgrid stc ribbon richtext")
endif()

if(UNIX)
find_path(CTAGS_SUBMODULE CMakeLists.txt PATHS ${CMAKE_SOURCE_DIR}/submodules/ctags/)
if(NOT CTAGS_SUBMODULE)
message(STATUS "Could not locate `${CMAKE_SOURCE_DIR}/submodules/ctags/CMakeLists.txt` file")
message(FATAL_ERROR "Please make sure you have run `git submodule update --init`")
endif()
endif()

# Appstream metadata
set(METAINFO_FILE "${CMAKE_SOURCE_DIR}/Runtime/org.codelite.codelite.metainfo.xml")
install(FILES ${METAINFO_FILE} DESTINATION share/metainfo)
Expand Down Expand Up @@ -890,6 +882,9 @@ endif()
# add the dtl module include path before we include Plugin folder
include_directories(submodules/dtl)

add_subdirectory(submodules)
include_directories(submodules/cJSON)

add_subdirectory(sdk/wxsqlite3 SYSTEM) # EXCLUDE_FROM_ALL)
add_subdirectory(sdk/wxshapeframework SYSTEM EXCLUDE_FROM_ALL)
add_subdirectory(sdk/databaselayer SYSTEM EXCLUDE_FROM_ALL)
Expand Down
4 changes: 3 additions & 1 deletion CodeLite/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,9 @@ target_link_libraries(
${LIBSSH_LIB}
${GTK_LIBS}
${ADDITIONAL_LIBRARIES}
${LIBUCHARDET_LIB})
${LIBUCHARDET_LIB}
cJSON
)

if(MINGW)
set_target_properties(
Expand Down
2 changes: 1 addition & 1 deletion CodeLite/JSON.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include <wx/gdicmn.h>
#include "codelite_exports.h"
#include <map>
#include "cJSON.h"
#include <cJSON.h>
#if wxUSE_GUI
#include <wx/arrstr.h>
#include <wx/colour.h>
Expand Down
Loading
Loading