tastytea
/
epubgrep
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases 9 Wiki Activity

Add nlohmann_json dependency.

This commit is contained in:
tastytea 2021-06-01 18:47:12 +02:00
parent b0b6c00a90
commit 88e4e78db8
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.drone.yml
View File

@ -27,7 +27,7 @@ steps:
- alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get' - alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get'
- apt-get update -q - apt-get update -q
- apt-get install -qq build-essential cmake clang locales - apt-get install -qq build-essential cmake clang locales
- apt-get install -qq catch libboost-program-options-dev libboost-locale-dev libboost-regex-dev libboost-log-dev gettext libarchive-dev libfmt-dev asciidoc libpugixml-dev - apt-get install -qq catch libboost-program-options-dev libboost-locale-dev libboost-regex-dev libboost-log-dev gettext libarchive-dev libfmt-dev asciidoc libpugixml-dev nlohmann-json3-dev
- rm -rf build && mkdir -p build && cd build - rm -rf build && mkdir -p build && cd build
- cmake -G "Unix Makefiles" -DWITH_TESTS=YES .. - cmake -G "Unix Makefiles" -DWITH_TESTS=YES ..
- make VERBOSE=1 - make VERBOSE=1
@ -60,12 +60,13 @@ steps:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
LANG: C.UTF-8 LANG: C.UTF-8
pugixml_DIR: "/usr/share/libpugixml-dev/cmake" pugixml_DIR: "/usr/share/libpugixml-dev/cmake"
nlohmann_json_DIR: "/usr/lib/cmake"
commands: commands:
- rm /etc/apt/apt.conf.d/docker-clean - rm /etc/apt/apt.conf.d/docker-clean
- alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get' - alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get'
- apt-get update -q - apt-get update -q
- apt-get install -qq g++-8 build-essential clang locales - apt-get install -qq g++-8 build-essential clang locales
- apt-get install -qq catch libboost-program-options-dev libboost-locale-dev libboost-regex-dev libboost-log-dev gettext libarchive-dev libfmt-dev asciidoc libpugixml-dev - apt-get install -qq catch libboost-program-options-dev libboost-locale-dev libboost-regex-dev libboost-log-dev gettext libarchive-dev libfmt-dev asciidoc libpugixml-dev nlohmann-json-dev
- sh cmake_installer.sh --skip-license --exclude-subdir --prefix=/usr/local - sh cmake_installer.sh --skip-license --exclude-subdir --prefix=/usr/local
- cp /usr/lib/x86_64-linux-gnu/libpugixml* /lib/x86_64-linux-gnu/ - cp /usr/lib/x86_64-linux-gnu/libpugixml* /lib/x86_64-linux-gnu/
- rm -rf build && mkdir -p build && cd build - rm -rf build && mkdir -p build && cd build
@ -119,12 +120,13 @@ steps:
CXXFLAGS: -pipe -O2 CXXFLAGS: -pipe -O2
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
LANG: C.UTF-8 LANG: C.UTF-8
nlohmann_json_DIR: "/usr/lib/cmake"
commands: commands:
- rm /etc/apt/apt.conf.d/docker-clean - rm /etc/apt/apt.conf.d/docker-clean
- alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get' - alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get'
- apt-get update -q - apt-get update -q
- apt-get install -qq build-essential cmake clang locales lsb-release - apt-get install -qq build-essential cmake clang locales lsb-release
- apt-get install -qq libboost-program-options-dev libboost-locale-dev libboost-regex-dev libboost-log-dev gettext libarchive-dev libfmt-dev asciidoc libpugixml-dev - apt-get install -qq libboost-program-options-dev libboost-locale-dev libboost-regex-dev libboost-log-dev gettext libarchive-dev libfmt-dev asciidoc libpugixml-dev nlohmann-json-dev
- rm -rf build && mkdir -p build && cd build - rm -rf build && mkdir -p build && cd build
- cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr .. - cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr ..
- make VERBOSE=1 - make VERBOSE=1
@ -148,7 +150,7 @@ steps:
- alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get' - alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get'
- apt-get update -q - apt-get update -q
- apt-get install -qq build-essential cmake clang locales lsb-release - apt-get install -qq build-essential cmake clang locales lsb-release
- apt-get install -qq libboost-program-options-dev libboost-locale-dev libboost-regex-dev libboost-log-dev gettext libarchive-dev libfmt-dev asciidoc libpugixml-dev - apt-get install -qq libboost-program-options-dev libboost-locale-dev libboost-regex-dev libboost-log-dev gettext libarchive-dev libfmt-dev asciidoc libpugixml-dev nlohmann-json3-dev
- rm -rf build && mkdir -p build && cd build - rm -rf build && mkdir -p build && cd build
- cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr .. - cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr ..
- make VERBOSE=1 - make VERBOSE=1
@ -176,12 +178,13 @@ steps:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
LANG: C.UTF-8 LANG: C.UTF-8
pugixml_DIR: "/usr/share/libpugixml-dev/cmake" pugixml_DIR: "/usr/share/libpugixml-dev/cmake"
nlohmann_json_DIR: "/usr/lib/cmake"
commands: commands:
- rm /etc/apt/apt.conf.d/docker-clean - rm /etc/apt/apt.conf.d/docker-clean
- alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get' - alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get'
- apt-get update -q - apt-get update -q
- apt-get install -qq g++-8 build-essential clang locales lsb-release - apt-get install -qq g++-8 build-essential clang locales lsb-release
- apt-get install -qq libboost-program-options-dev libboost-locale-dev libboost-regex-dev libboost-log-dev gettext libarchive-dev libfmt-dev asciidoc libpugixml-dev - apt-get install -qq libboost-program-options-dev libboost-locale-dev libboost-regex-dev libboost-log-dev gettext libarchive-dev libfmt-dev asciidoc libpugixml-dev nlohmann-json-dev
- sh cmake_installer.sh --skip-license --exclude-subdir --prefix=/usr/local - sh cmake_installer.sh --skip-license --exclude-subdir --prefix=/usr/local
- cp /usr/lib/x86_64-linux-gnu/libpugixml* /lib/x86_64-linux-gnu/ - cp /usr/lib/x86_64-linux-gnu/libpugixml* /lib/x86_64-linux-gnu/
- rm -rf build && mkdir -p build && cd build - rm -rf build && mkdir -p build && cd build

1
CMakeLists.txt
View File

@ -41,6 +41,7 @@ if(NOT termcolor_FOUND)
endif() endif()
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
find_package(pugixml REQUIRED CONFIG) find_package(pugixml REQUIRED CONFIG)
find_package(nlohmann_json REQUIRED CONFIG)
add_subdirectory(src) add_subdirectory(src)

5
README.adoc
View File

@ -16,6 +16,7 @@
:uri-asciidoc: http://asciidoc.org/ :uri-asciidoc: http://asciidoc.org/
:uri-termcolor: https://termcolor.readthedocs.io/ :uri-termcolor: https://termcolor.readthedocs.io/
:uri-pugixml: https://pugixml.org/ :uri-pugixml: https://pugixml.org/
:uri-json: https://nlohmann.github.io/json/
:license: https://schlomp.space/tastytea/{project}/src/branch/main/LICENSE :license: https://schlomp.space/tastytea/{project}/src/branch/main/LICENSE
:license-termcolor: https://schlomp.space/tastytea/{project}/src/branch/main/dist/termcolor/LICENSE :license-termcolor: https://schlomp.space/tastytea/{project}/src/branch/main/dist/termcolor/LICENSE
@ -86,6 +87,7 @@ If you get the error message that `add-apt-repository` was not found, install
* link:{uri-termcolor}[Termcolor] (tested: 2.0) (If not found, the bundled * link:{uri-termcolor}[Termcolor] (tested: 2.0) (If not found, the bundled
version is used.) version is used.)
* link:{uri-pugixml}[pugixml] (tested: 1.11 / 1.8) * link:{uri-pugixml}[pugixml] (tested: 1.11 / 1.8)
* link:{uri-json}[nlohmann_json] (tested: 3.9 / 2.0)
* Optional * Optional
** Tests: link:{uri-catch}[Catch] (tested: 2.13 / 1.10) ** Tests: link:{uri-catch}[Catch] (tested: 2.13 / 1.10)
@ -99,7 +101,8 @@ of CMake.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
sudo apt install build-essential cmake libboost-program-options-dev \ sudo apt install build-essential cmake libboost-program-options-dev \
libboost-locale-dev libboost-regex-dev libboost-log-dev \ libboost-locale-dev libboost-regex-dev libboost-log-dev \
gettext libarchive-dev libfmt-dev asciidoc libpugixml-dev gettext libarchive-dev libfmt-dev asciidoc libpugixml-dev \
nlohmann-json3?-dev
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
==== Get sourcecode ==== Get sourcecode

3
src/CMakeLists.txt
View File

@ -32,7 +32,8 @@ target_link_libraries(${PROJECT_NAME}_lib
termcolor::termcolor termcolor::termcolor
Threads::Threads Threads::Threads
m m
pugixml) pugixml
nlohmann_json)
if(${CMAKE_VERSION} VERSION_LESS 3.17) if(${CMAKE_VERSION} VERSION_LESS 3.17)
target_link_libraries(${PROJECT_NAME}_lib target_link_libraries(${PROJECT_NAME}_lib