mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 17:39:00 +08:00
f9d514aea5
* [restc-cpp] new port * Updated port's version-string Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [restc-cpp] added port version * [restc-cpp] new port * Updated port's version-string Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [restc-cpp] added port version * [restc_cpp] updated MSVC CRT linkage * [restc-cpp] reformated vcpkg.json * [restc-cpp] updated port's version * [restc-cpp] excluded dependency on cmake external projects * [restc-cpp] updated version hash * [rest-cpp] Remove changes about CRT linkage * update version record * Update ports/restc-cpp/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [restc-cpp] added an error message for mutual exclusive logging features * [restc-cpp] updated port version * Updated ports/restc-cpp/vcpkg.json Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Updated ports/restc-cpp/vcpkg.json Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Update ports/restc-cpp/vcpkg.json Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Updated ports/restc-cpp/vcpkg.json Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Updated ports/restc-cpp/vcpkg.json Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Updated ports/restc-cpp/vcpkg.json Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Updated ports/restc-cpp/portfile.cmake Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Updated ports/restc-cpp/portfile.cmake Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Updated ports/restc-cpp/portfile.cmake Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * [restc-cpp] updated port version * [restc-cpp] version file has to declare version as 'version-semver' Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
25 lines
895 B
Diff
25 lines
895 B
Diff
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)
|
|
|