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

Support using the system rapidjson to build #101443

Merged
merged 1 commit into from
Jul 3, 2024
+12 −4
Merged

Support using the system rapidjson to build #101443

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
4 changes: 4 additions & 0 deletions src/native/corehost/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ add_library(fxr_resolver INTERFACE)
target_sources(fxr_resolver INTERFACE fxr_resolver.cpp)
target_include_directories(fxr_resolver INTERFACE fxr)

if ((NOT DEFINED CLR_CMAKE_USE_SYSTEM_RAPIDJSON) OR (NOT CLR_CMAKE_USE_SYSTEM_RAPIDJSON))
include_directories(${CLR_SRC_NATIVE_DIR}/external/)
endif()

add_subdirectory(hostcommon)
add_subdirectory(hostmisc)
add_subdirectory(fxr)
Expand Down
4 changes: 4 additions & 0 deletions src/native/corehost/apphost/static/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ add_subdirectory(../../hostmisc hostmisc)
configure_file(${CLR_SRC_NATIVE_DIR}/corehost/configure.h.in ${GENERATED_INCLUDE_DIR}/corehost/configure.h)
target_include_directories(hostmisc PUBLIC ${GENERATED_INCLUDE_DIR}/corehost)

if ((NOT DEFINED CLR_CMAKE_USE_SYSTEM_RAPIDJSON) OR (NOT CLR_CMAKE_USE_SYSTEM_RAPIDJSON))
include_directories(${CLR_SRC_NATIVE_DIR}/external/)
endif()

set(SOURCES
../bundle_marker.cpp
./hostfxr_resolver.cpp
Expand Down
2 changes: 1 addition & 1 deletion src/native/corehost/json_parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#define RAPIDJSON_ERROR_STRING(x) _X(x)

#include <json_parser.h>
#include <external/rapidjson/error/en.h>
#include <rapidjson/error/en.h>
#include "utils.h"
#include <cassert>
#include <cstdint>
Expand Down
4 changes: 2 additions & 2 deletions src/native/corehost/json_parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#endif

#include "pal.h"
#include <external/rapidjson/document.h>
#include <external/rapidjson/fwd.h>
#include <rapidjson/document.h>
#include <rapidjson/fwd.h>
#include <vector>
#include "bundle/info.h"

Expand Down
2 changes: 1 addition & 1 deletion src/native/corehost/runtime_config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "json_parser.h"
#include "pal.h"
#include <external/rapidjson/writer.h>
#include <rapidjson/writer.h>
#include "roll_fwd_on_no_candidate_fx_option.h"
#include "runtime_config.h"
#include "trace.h"
Expand Down
Loading