Commit e455b6d6 authored by Hannah von Reth's avatar Hannah von Reth

Don't use a submodule for json, just use the standalone header

parent 84752abe
[submodule "src/3dparty/json"]
path = src/3dparty/json
url = https://github.com/nlohmann/json.git
[submodule "src/3dparty/args"]
path = src/3dparty/args
url = https://github.com/Taywee/args.git
add_subdirectory(json EXCLUDE_FROM_ALL)
add_subdirectory(args EXCLUDE_FROM_ALL)
Subproject commit db53bdac1926d1baebcb459b685dcd2e4608c355
MIT License
Copyright (c) 2013-2019 Niels Lohmann
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
This diff is collapsed.
......@@ -8,7 +8,7 @@ else()
target_sources(kshimgen PRIVATE kshim_unix.cpp)
endif()
target_link_libraries(kshimgen PRIVATE nlohmann_json::nlohmann_json args)
target_link_libraries(kshimgen PRIVATE args)
target_compile_definitions(kshimgen PRIVATE _CRT_SECURE_NO_WARNINGS)
install(TARGETS kshimgen RUNTIME DESTINATION bin)
......@@ -26,7 +26,7 @@
#include "kshimdata.h"
#include "kshim.h"
#include "nlohmann/json.hpp"
#include "3dparty/nlohmann/json.hpp"
#include <iostream>
#include <iomanip>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment