Skip to content
This repository has been archived by the owner on Feb 1, 2021. It is now read-only.

FOGL-3145 Remove RapidJSON from the 3rd party code and use package #1642

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

FOGL-3145 Remove RapidJSON from the 3rd party code and use package #1642

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7ed1e6c
FOGL-3145 Switch to packaged version of rapidjson
MarkRiddoch Aug 16, 2019
f5fecf5
FOGL-3145 Coral Mendel Linux only supports a very old version of
MarkRiddoch Aug 16, 2019
33cc315
Merge branch 'develop' into FOGL-3145
ashish-jabble Aug 19, 2019
b91e7d3
typo fixes
ashish-jabble Aug 19, 2019
3da3647
Merge branch 'develop' into FOGL-3145
MarkRiddoch Sep 11, 2019
8db6379
Merge branch 'develop' into FOGL-3145
MarkRiddoch Sep 30, 2019
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
2 changes: 1 addition & 1 deletion C/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ include_directories(SYSTEM ${Boost_INCLUDE_DIR})
file(GLOB SOURCES *.cpp)

# Include header files
include_directories(include ../services/common/include ../common/include ../thirdparty/rapidjson/include ../thirdparty/Simple-Web-Server)
include_directories(include ../services/common/include ../common/include ../thirdparty/Simple-Web-Server)

set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/../lib)

Expand Down
1 change: 0 additions & 1 deletion C/plugins/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ include_directories(include)
include_directories(../../common/include)
include_directories(../../services/common/include)
include_directories(../../thirdparty/Simple-Web-Server)
include_directories(../../thirdparty/rapidjson/include)

set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/../../lib)

Expand Down
1 change: 0 additions & 1 deletion C/plugins/filter/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ file(GLOB SOURCES *.cpp)
# Include header files
include_directories(include ../../../common/include ../../../services/common/include)
include_directories(../../../thirdparty/Simple-Web-Server)
include_directories(../../../thirdparty/rapidjson/include)

set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/../../../lib)

Expand Down
1 change: 0 additions & 1 deletion C/plugins/north/PI_Server_V2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ include_directories(../../../services/common/include)
include_directories(../../../common/include)
include_directories(../../../plugins/common/include)
include_directories(../../../thirdparty/Simple-Web-Server)
include_directories(../../../thirdparty/rapidjson/include)
link_directories(${PROJECT_BINARY_DIR}/../../../lib)

# Create shared library
Expand Down
1 change: 0 additions & 1 deletion C/plugins/north/ocs_V2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ include_directories(../../../services/common/include)
include_directories(../../../common/include)
include_directories(../../../plugins/common/include)
include_directories(../../../thirdparty/Simple-Web-Server)
include_directories(../../../thirdparty/rapidjson/include)
link_directories(${PROJECT_BINARY_DIR}/../../../lib)

# Create shared library
Expand Down
1 change: 0 additions & 1 deletion C/plugins/storage/postgres/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ file(GLOB SOURCES *.cpp)

# Include header files
include_directories(include ../../../common/include ../../../services/common/include ../common/include)
include_directories(../../../thirdparty/rapidjson/include)
link_directories(${PROJECT_BINARY_DIR}/../../../lib)

if(${RH_POSTGRES_FOUND} EQUAL 1)
Expand Down
1 change: 0 additions & 1 deletion C/plugins/storage/sqlite/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ include_directories(./common/include)
include_directories(../../../common/include)
include_directories(../../../services/common/include)
include_directories(../common/include)
include_directories(../../../thirdparty/rapidjson/include)
link_directories(${PROJECT_BINARY_DIR}/../../../lib)

# Create shared library
Expand Down
1 change: 0 additions & 1 deletion C/plugins/storage/sqlitememory/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ file(GLOB SOURCES *.cpp)
include_directories(../../../common/include)
include_directories(../../../services/common/include)
include_directories(../common/include)
include_directories(../../../thirdparty/rapidjson/include)
# Add sqlite plugin header files
include_directories(../sqlite/include)
include_directories(../sqlite/common/include)
Expand Down
2 changes: 1 addition & 1 deletion C/services/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ file(GLOB SOURCES *.cpp)
pkg_check_modules(PYTHON REQUIRED python3)

# Include header files
include_directories(include ../../common/include ../../thirdparty/Simple-Web-Server ../../thirdparty/rapidjson/include)
include_directories(include ../../common/include ../../thirdparty/Simple-Web-Server)

# Add Python 3.x header files
include_directories(${PYTHON_INCLUDE_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion C/services/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set(UUIDLIB -luuid)
set(COMMON_LIB common-lib)
set(SERVICE_COMMON_LIB services-common-lib)

include_directories(. include ../../thirdparty/Simple-Web-Server ../../thirdparty/rapidjson/include ../common/include ../../common/include)
include_directories(. include ../../thirdparty/Simple-Web-Server ../common/include ../../common/include)

find_package(Threads REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion C/services/filter-plugin-interfaces/python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ file(GLOB SOURCES python_plugin_interface.cpp ../../../services/common-plugin-in
pkg_check_modules(PYTHON REQUIRED python3)

# Include header files
include_directories(include ../../../common/include ../../../services/common/include ../../../services/south/include ../../../thirdparty/rapidjson/include)
include_directories(include ../../../common/include ../../../services/common/include ../../../services/south/include)
include_directories(../../../services/common-plugin-interfaces/python/include)

# Add Python 3.x header files
Expand Down
1 change: 0 additions & 1 deletion C/services/filter-plugin-interfaces/python/filter_ingest_pymodule/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ include_directories(include)
include_directories(../../../../common/include)
include_directories(../../../../services/common/include)
include_directories(../../../../services/south/include)
include_directories(../../../../thirdparty/rapidjson/include)

# Add Python 3.x header files
include_directories(${PYTHON_INCLUDE_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion C/services/notification-plugin-interfaces/python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ file(GLOB SOURCES python_plugin_interface.cpp)
pkg_check_modules(PYTHON REQUIRED python3)

# Include header files
include_directories(include ../../../common/include ../../../services/common/include ../../../services/south/include ../../../thirdparty/rapidjson/include)
include_directories(include ../../../common/include ../../../services/common/include ../../../services/south/include)
include_directories(../../../services/common-plugin-interfaces/python/include)

# Add Python 3.x header files
Expand Down
2 changes: 1 addition & 1 deletion C/services/south-plugin-interfaces/python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ file(GLOB SOURCES python_plugin_interface.cpp ../../common-plugin-interfaces/pyt
pkg_check_modules(PYTHON REQUIRED python3)

# Include header files
include_directories(include ../../../common/include ../../../services/common/include ../../../services/south/include ../../../thirdparty/rapidjson/include)
include_directories(include ../../../common/include ../../../services/common/include ../../../services/south/include)
include_directories(../../../services/common-plugin-interfaces/python/include)

# Add Python 3.x header files
Expand Down
2 changes: 1 addition & 1 deletion C/services/south-plugin-interfaces/python/async_ingest_pymodule/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ file(GLOB SOURCES ingest_callback_pymodule.cpp ../../../common-plugin-interfaces
pkg_check_modules(PYTHON REQUIRED python3)

# Include header files
include_directories(include ../../../../common/include ../../../../services/common/include ../../../../services/south/include ../../../../thirdparty/rapidjson/include)
include_directories(include ../../../../common/include ../../../../services/common/include ../../../../services/south/include)

# Add Python 3.x header files
include_directories(${PYTHON_INCLUDE_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion C/services/south/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set(COMMON_LIB common-lib)
set(SERVICE_COMMON_LIB services-common-lib)
set(EXEC foglamp.services.south)

include_directories(. include ../../thirdparty/Simple-Web-Server ../../thirdparty/rapidjson/include ../common/include ../../common/include)
include_directories(. include ../../thirdparty/Simple-Web-Server ../common/include ../../common/include)

find_package(Threads REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion C/services/storage/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set(COMMON_LIB common-lib)
set(SERVICE_COMMON_LIB services-common-lib)
set(EXEC foglamp.services.storage)

include_directories(. include ../../thirdparty/Simple-Web-Server ../../thirdparty/rapidjson/include ../common/include ../../common/include)
include_directories(. include ../../thirdparty/Simple-Web-Server ../common/include ../../common/include)

find_package(Threads REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion C/tasks/north/sending_process/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set(COMMON_LIB common-lib)
set(SERVICE_COMMON_LIB services-common-lib)
set(PLUGINS_COMMON_LIB plugins-common-lib)

include_directories(. include ../../../thirdparty/Simple-Web-Server ../../../thirdparty/rapidjson/include ../../../common/include ../../../services/common/include ../../../plugins/common/include)
include_directories(. include ../../../thirdparty/Simple-Web-Server ../../../common/include ../../../services/common/include ../../../plugins/common/include)

find_package(Threads REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion C/tasks/statistics_history/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wsign-conversi
set(UUIDLIB -luuid)
set(COMMON_LIB common-lib)

include_directories(. include ../../thirdparty/Simple-Web-Server ../../thirdparty/rapidjson/include ../../common/include)
include_directories(. include ../../thirdparty/Simple-Web-Server ../../common/include)

find_package(Threads REQUIRED)

Expand Down
22 changes: 0 additions & 22 deletions C/thirdparty/rapidjson/.gitattributes
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions C/thirdparty/rapidjson/.gitignore
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions C/thirdparty/rapidjson/.gitmodules
View file
Open in desktop

This file was deleted.

99 changes: 0 additions & 99 deletions C/thirdparty/rapidjson/.travis.yml
View file
Open in desktop

This file was deleted.

Loading