External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nlohmann:develop' into feature/sapitskiy/spm-support

Browse Source
This commit is contained in:
Aleksei Sapitskii 2023-10-09 11:21:23 +03:00 committed by Aleksei Sapitskii
commit b87c908c01
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/windows.yml vendored
View File

@ -29,6 +29,7 @@ jobs:
uses: egor-tensin/setup-mingw@v2 uses: egor-tensin/setup-mingw@v2
with: with:
platform: ${{ matrix.architecture }} platform: ${{ matrix.architecture }}
version: 12.2.0 # https://github.com/egor-tensin/setup-mingw/issues/14
- name: Run CMake - name: Run CMake
run: cmake -S . -B build -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On run: cmake -S . -B build -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On
- name: Build - name: Build

6
Package.swift
View File

@ -6,14 +6,14 @@ import PackageDescription
let package = Package( let package = Package(
name: "nlohmann-json", name: "nlohmann-json",
platforms: [ platforms: [
.iOS(.v11), .macOS(.v10_13), .tvOS(.v11), .watchOS(.v4) .iOS(.v12), .macOS(.v10_13), .tvOS(.v12), .watchOS(.v4)
], ],
products: [ products: [
.library(name: "nlohmann-json", targets: ["nlohmann-json"]) .library(name: "json", targets: ["json"])
], ],
targets: [ targets: [
.target( .target(
name: "nlohmann-json", name: "json",
path: "single_include/nlohmann", path: "single_include/nlohmann",
publicHeadersPath: "." publicHeadersPath: "."
) )