mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 23:49:06 +08:00
c8e1797c30
* [jsonnet] Update to 0.18.0 (#20627) * Update jsonnet to 0.18.0 * update patch files * add 0005-use-upstream-rapidyaml.patch to use system rapidyaml * use system rapidyaml * update version * Added license "Apache-2.0" to vcpkg.json from https://github.com/google/jsonnet/blob/master/LICENSE
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 23a8114..f430146 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -15,6 +15,7 @@ option(BUILD_STATIC_LIBS "Build a static libjsonnet." ON)
|
|
option(BUILD_SHARED_BINARIES "Link binaries to the shared libjsonnet instead of the static one." OFF)
|
|
option(USE_SYSTEM_GTEST "Use system-provided gtest library" OFF)
|
|
option(USE_SYSTEM_JSON "Use the system-provided json library" OFF)
|
|
+option(USE_SYSTEM_RYML "Use the system-provided rapidyaml library" OFF)
|
|
set(GLOBAL_OUTPUT_PATH_SUFFIX "" CACHE STRING
|
|
"Output artifacts directory.")
|
|
|
|
@@ -104,6 +105,11 @@ if(USE_SYSTEM_JSON)
|
|
else()
|
|
add_subdirectory(third_party/json)
|
|
endif()
|
|
+if(USE_SYSTEM_RYML)
|
|
+ find_package(ryml CONFIG REQUIRED)
|
|
+else()
|
|
+ add_subdirectory(third_party/rapidyaml/rapidyaml ryml)
|
|
+endif()
|
|
|
|
# Look for libraries in global output path.
|
|
link_directories(${GLOBAL_OUTPUT_PATH})
|
|
@@ -124,7 +130,6 @@ endif()
|
|
add_subdirectory(include)
|
|
add_subdirectory(stdlib)
|
|
add_subdirectory(third_party/md5)
|
|
-add_subdirectory(third_party/rapidyaml/rapidyaml ryml)
|
|
add_subdirectory(core)
|
|
add_subdirectory(cpp)
|
|
add_subdirectory(cmd)
|
|
diff --git a/core/vm.cpp b/core/vm.cpp
|
|
index e328df5..2cafbb7 100644
|
|
--- a/core/vm.cpp
|
|
+++ b/core/vm.cpp
|
|
@@ -26,8 +26,8 @@ limitations under the License.
|
|
#include "nlohmann/json.hpp"
|
|
#include "md5.h"
|
|
#include "parser.h"
|
|
-#include "ryml_std.hpp" // include this before any other ryml header
|
|
-#include "ryml.hpp"
|
|
+#include "ryml/ryml_std.hpp" // include this before any other ryml header
|
|
+#include "ryml/ryml.hpp"
|
|
#include "state.h"
|
|
#include "static_analysis.h"
|
|
#include "string_utils.h"
|