Browse Source

Meta+CMake: Convert JSON library from git submodule to system package

master
Riyyi 3 years ago
parent
commit
644255200e
  1. 3
      .gitmodules
  2. 1
      CMakeLists.txt
  3. 1
      README.org
  4. 2
      src/config.cpp
  5. 1
      vendor/json

3
.gitmodules vendored

@ -1,3 +0,0 @@
[submodule "vendor/json"]
path = vendor/json
url = https://github.com/nlohmann/json

1
CMakeLists.txt

@ -56,7 +56,6 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
include_directories(
"src"
"test"
"vendor/json/include"
)
# Define source files

1
README.org

@ -22,6 +22,7 @@ This package is available through the AUR, linked here [[https://aur.archlinux.o
+ (make) ~cmake~
+ (make) ~git~
+ (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) ~pacman-contrib~
+ (optional) ~apt-cache~, ~apt-mark~, ~dpkg-query~

2
src/config.cpp

@ -11,7 +11,7 @@
#include <string>
#include <vector>
#include "nlohmann/json.hpp"
#include <nlohmann/json.hpp>
#include "config.h"

1
vendor/json vendored

@ -1 +0,0 @@
Subproject commit eec79d4e8a306d0dc389d6ab7294478249069e51
Loading…
Cancel
Save