Meta+CMake: Convert JSON library from git submodule to system package
This commit is contained in:
@@ -1,3 +0,0 @@
|
|||||||
[submodule "vendor/json"]
|
|
||||||
path = vendor/json
|
|
||||||
url = https://github.com/nlohmann/json
|
|
||||||
@@ -56,7 +56,6 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
|||||||
include_directories(
|
include_directories(
|
||||||
"src"
|
"src"
|
||||||
"test"
|
"test"
|
||||||
"vendor/json/include"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# Define source files
|
# Define source files
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ This package is available through the AUR, linked here [[https://aur.archlinux.o
|
|||||||
+ (make) ~cmake~
|
+ (make) ~cmake~
|
||||||
+ (make) ~git~
|
+ (make) ~git~
|
||||||
+ (make) ~gzip~
|
+ (make) ~gzip~
|
||||||
|
+ (make) ~nlohmann-json~ [[https://archlinux.org/packages/community/any/nlohmann-json/][arch]], [[https://packages.debian.org/search?keywords=nlohmann-json][debian]], [[https://packages.ubuntu.com/search?keywords=nlohmann-json][ubuntu]]
|
||||||
+ (optional) ~grep~
|
+ (optional) ~grep~
|
||||||
+ (optional) ~pacman-contrib~
|
+ (optional) ~pacman-contrib~
|
||||||
+ (optional) ~apt-cache~, ~apt-mark~, ~dpkg-query~
|
+ (optional) ~apt-cache~, ~apt-mark~, ~dpkg-query~
|
||||||
|
|||||||
+1
-1
@@ -11,7 +11,7 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "nlohmann/json.hpp"
|
#include <nlohmann/json.hpp>
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
|||||||
Vendored
-1
Submodule vendor/json deleted from eec79d4e8a
Reference in New Issue
Block a user