mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 10:29:00 +08:00
514f2debfc
* Update jsonnet to 0.17.0 * Update CI baseline * add supports * update version * revert portfile.cmake * update version Co-authored-by: chausner <chausner@users.noreply.github.com> Co-authored-by: Jonliu1993 <13720414433@163.com>
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
|
|
--- a/core/CMakeLists.txt
|
|
+++ b/core/CMakeLists.txt
|
|
@@ -15,7 +15,8 @@ set(LIBJSONNET_HEADERS
|
|
static_error.h
|
|
string_utils.h
|
|
unicode.h
|
|
- vm.h)
|
|
+ vm.h
|
|
+ ../third_party/md5/md5.h)
|
|
|
|
set(LIBJSONNET_SOURCE
|
|
desugarer.cpp
|
|
@@ -26,12 +27,13 @@ set(LIBJSONNET_SOURCE
|
|
pass.cpp
|
|
static_analysis.cpp
|
|
string_utils.cpp
|
|
- vm.cpp)
|
|
+ vm.cpp
|
|
+ ../third_party/md5/md5.cpp)
|
|
|
|
if (BUILD_SHARED_BINARIES)
|
|
add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE})
|
|
-add_dependencies(libjsonnet md5 stdlib)
|
|
-target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json)
|
|
+add_dependencies(libjsonnet stdlib)
|
|
+target_link_libraries(libjsonnet nlohmann_json::nlohmann_json)
|
|
|
|
file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/../include/libjsonnet.h JSONNET_VERSION_DEF
|
|
REGEX "[#]define[ \t]+LIB_JSONNET_VERSION[ \t]+")
|
|
@@ -54,8 +56,8 @@ endif()
|
|
if (BUILD_STATIC_LIBS)
|
|
# Static library for jsonnet command-line tool.
|
|
add_library(libjsonnet_static STATIC ${LIBJSONNET_SOURCE})
|
|
- add_dependencies(libjsonnet_static md5 stdlib)
|
|
- target_link_libraries(libjsonnet_static md5 nlohmann_json::nlohmann_json)
|
|
+ add_dependencies(libjsonnet_static stdlib)
|
|
+ target_link_libraries(libjsonnet_static nlohmann_json::nlohmann_json)
|
|
set_target_properties(libjsonnet_static PROPERTIES OUTPUT_NAME jsonnet)
|
|
install(TARGETS libjsonnet_static DESTINATION "${CMAKE_INSTALL_LIBDIR}")
|
|
target_include_directories(libjsonnet_static INTERFACE
|