Added nlohmann json as submodule

dev
Tomasz Kapuściński 2022-02-26 21:12:40 +01:00
parent 38990e283b
commit 628567701a
4 changed files with 11 additions and 5 deletions

View File

@ -14,7 +14,7 @@ jobs:
fail-fast: false
steps:
- name: Install Colobot dependencies
run: sudo add-apt-repository ppa:team-xbmc/ppa && sudo apt-get update && sudo apt-get install -y --no-install-recommends build-essential cmake libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev libsndfile1-dev libvorbis-dev libogg-dev libpng-dev libglew-dev libopenal-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev libphysfs-dev gettext git po4a vorbis-tools librsvg2-bin xmlstarlet libglm-dev nlohmann-json3-dev
run: sudo apt-get update && sudo apt-get install -y --no-install-recommends build-essential cmake libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev libsndfile1-dev libvorbis-dev libogg-dev libpng-dev libglew-dev libopenal-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev libphysfs-dev gettext git po4a vorbis-tools librsvg2-bin xmlstarlet libglm-dev
if: matrix.container == ''
- uses: actions/checkout@v2
- name: Checkout the Google Test submodule
@ -100,9 +100,9 @@ jobs:
with:
vcpkgGitCommitId: '210240b399fbc2f1363f4103b6a93629c207d7e3'
vcpkgTriplet: ${{ matrix.vcpkg_triplet }}
vcpkgArguments: 'boost-system boost-filesystem boost-regex boost-lexical-cast boost-bimap boost-algorithm boost-property-tree boost-optional boost-range sdl2 sdl2-ttf sdl2-image glew libpng libwebp tiff gettext libsndfile libvorbis libogg openal-soft physfs glm nlohmann-json'
vcpkgArguments: 'boost-system boost-filesystem boost-regex boost-lexical-cast boost-bimap boost-algorithm boost-property-tree boost-optional boost-range sdl2 sdl2-ttf sdl2-image glew libpng libwebp tiff gettext libsndfile libvorbis libogg openal-soft physfs glm'
# SHA-256 hash of the list of packages above, for caching purposes
appendedCacheKey: 'd04bfd69e02abc03ef692bf478791940bf4e82d4bcc45e5948a2c7b503b03848'
appendedCacheKey: '83b5e9a4328552da34acd5a2fb62a8c000261fd04755ff2368f967774e0db7cd'
- name: Install external tools
working-directory: ${{ github.workspace }}
run: |
@ -158,7 +158,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Install Colobot dependencies
run: sudo add-apt-repository ppa:team-xbmc/ppa && sudo apt-get update && sudo apt-get install -y --no-install-recommends build-essential cmake libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev libsndfile1-dev libvorbis-dev libogg-dev libpng-dev libglew-dev libopenal-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev libphysfs-dev gettext git po4a vorbis-tools librsvg2-bin xmlstarlet doxygen graphviz libglm-dev nlohmann-json3-dev
run: sudo apt-get update && sudo apt-get install -y --no-install-recommends build-essential cmake libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev libsndfile1-dev libvorbis-dev libogg-dev libpng-dev libglew-dev libopenal-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev libphysfs-dev gettext git po4a vorbis-tools librsvg2-bin xmlstarlet doxygen graphviz libglm-dev
- uses: actions/checkout@v2
- name: Create build directory
run: cmake -E make_directory build

3
.gitmodules vendored
View File

@ -7,3 +7,6 @@
path = lib/googletest
url = git://github.com/google/googletest.git
ignore = all
[submodule "lib/json"]
path = lib/json
url = https://github.com/nlohmann/json

View File

@ -314,13 +314,15 @@ find_package(PNG 1.2 REQUIRED)
find_package(Gettext REQUIRED)
find_package(PhysFS REQUIRED)
find_package(glm CONFIG REQUIRED)
find_package(nlohmann_json CONFIG REQUIRED)
# Add target alias glm::glm for older versions of the library
if(NOT TARGET glm::glm)
add_library(glm::glm ALIAS glm)
endif()
add_subdirectory(lib/json)
find_package(nlohmann_json CONFIG REQUIRED)
set(Boost_USE_STATIC_LIBS ${BOOST_STATIC})
set(Boost_USE_MULTITHREADED ON)
set(Boost_USE_STATIC_RUNTIME ${USE_STATIC_RUNTIME})

1
lib/json Submodule

@ -0,0 +1 @@
Subproject commit e4643d1f1b03fc7a1d7b65f17e012ca93680cad8