early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,24 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa690fe..d3ff45d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ if (NOT DEFINED INSTALL_RAPIDJSON_HEADERS)
option(INSTALL_RAPIDJSON_HEADERS "Install rapidjson headers when make install is executed" ON)
endif()
-include(cmake_scripts/external-projects.cmake)
+#include(cmake_scripts/external-projects.cmake)
if (EXISTS ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
message(STATUS "Using conan configuration: ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
@@ -137,7 +137,9 @@ target_include_directories(${PROJECT_NAME}
SET_CPP_STANDARD(${PROJECT_NAME})
-add_dependencies(${PROJECT_NAME} externalRapidJson)
+#add_dependencies(${PROJECT_NAME} externalRapidJson)
+find_package(RapidJSON CONFIG REQUIRED)
+target_include_directories(${PROJECT_NAME} PRIVATE ${RAPIDJSON_INCLUDE_DIRS})
if (NOT EMBEDDED_RESTC_CPP)