Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# ChangeLog

## UNRELEASED
- Update libjsonnet to [v0.22.0](https://github.com/google/jsonnet/releases/tag/v0.22.0).

## v3.0.1 (2025-09-19)
- The package is now compatible with CMake 4.
Expand Down
11 changes: 8 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 3.10)
cmake_minimum_required(VERSION 3.15)
cmake_policy(SET CMP0042 NEW)

project (node-jsonnet)
file(GLOB SOURCE_FILES "src/*.cpp")
add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${CMAKE_JS_SRC})
set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON)
target_link_libraries(${PROJECT_NAME} ${CMAKE_JS_LIB} libjsonnet)
target_link_libraries(${PROJECT_NAME} ${CMAKE_JS_LIB} jsonnet_shared)
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_JS_INC})
target_compile_definitions(${PROJECT_NAME} PRIVATE "NAPI_VERSION=6" "NODE_ADDON_API_DISABLE_DEPRECATED")
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
Expand All @@ -18,5 +18,10 @@ if(DEFINED ENV{NODE_JSONNET_ENABLE_COVERAGE})
target_compile_options(${PROJECT_NAME} PRIVATE --coverage)
endif()

set(BUILD_TESTS OFF CACHE BOOL "Disable jsonnet tests")
set(BUILD_TESTS OFF CACHE BOOL "" FORCE)
set(BUILD_JSONNET OFF CACHE BOOL "" FORCE)
set(BUILD_JSONNETFMT OFF CACHE BOOL "" FORCE)
set(BUILD_STATIC_LIBS OFF CACHE BOOL "" FORCE)
set(BUILD_SHARED_BINARIES ON CACHE BOOL "" FORCE)
set(BUILD_MAN_PAGES OFF CACHE BOOL "" FORCE)
add_subdirectory(third_party/jsonnet EXCLUDE_FROM_ALL)
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The library is documented in the TypeScript type definitions at [`types/index.d.

- [Node.js](https://nodejs.org/) v20 or later
- [GCC](https://gcc.gnu.org/projects/cxx-status.html#cxx17) or [Clang](https://clang.llvm.org/cxx_status.html#cxx17) C++ compiler that supports C++17
- CMake 3.10 or later
- CMake 3.15 or later

## License
**@hanazuki/node-jsonnet** is licensed under the MIT License (See [LICENSE](LICENSE) file for the terms). **libjsonnet**, whose source code is bundled in the distributed NPM packages of @hanazuki/node-jsonnet, is licensed under the Apache License, Version 2.0 (See [third_party/jsonnet/LICENSE in this package](third_party/jsonnet/LICENSE) or [LICENSE file in the original repository](https://github.com/google/jsonnet/blob/master/LICENSE)). libjsonnet also bundles third-party software that is subject to other OSS licenses.
Empty file added patches/jsonnet/.keep
Empty file.
42 changes: 0 additions & 42 deletions patches/jsonnet/0001-Add-cmake4-to-cmake_minimum_required.patch

This file was deleted.

2 changes: 1 addition & 1 deletion third_party/jsonnet
Submodule jsonnet updated 157 files
Loading