add external

GraphicsEnthusiast · Sep 11, 2024 · efecfbf · efecfbf
1 parent e547f63
commit efecfbf
Show file tree

Hide file tree

Showing 48 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,8 +25,8 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/spdlog)
 
 # Add imgui
 set(IMGUI_INCLUDE_DIRS
-${CMAKE_CURRENT_SOURCE_DIR}/external/imgui
-${CMAKE_CURRENT_SOURCE_DIR}/external/imgui/backends
+    ${CMAKE_CURRENT_SOURCE_DIR}/external/imgui
+    ${CMAKE_CURRENT_SOURCE_DIR}/external/imgui/backends
 )
 set(IMGUI_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/external/imgui/imgui.cpp
@@ -44,8 +44,8 @@ add_library(imgui ${IMGUI_SRCS})
 set(FMT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/external/fmt/include)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/fmt)
 
-# Add nlohmann_json
-set(NLOHMANN_JSON_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/external/nlohmann_json/include)
+# Add nlohmann
+set(NLOHMANN_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/external/nlohmann/include)
 
 # Add embree
 set(EMBREE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/external/embree/include)
@@ -68,7 +68,7 @@ include_directories(
     ${SPDLOG_INCLUDE_DIRS}
     ${IMGUI_INCLUDE_DIRS}
     ${FMT_INCLUDE_DIRS}
-    ${NLOHMANN_JSON_INCLUDE_DIRS}
+    ${NLOHMANN_INCLUDE_DIRS}
     ${EMBREE_INCLUDE_DIRS}
     ${STB_INCLUDE_DIRS}
     ${TINY_INCLUDE_DIRS}

diff --git a/...json/debug/lib/pkgconfig/nlohmann_json.pc → ...mann/debug/lib/pkgconfig/nlohmann_json.pc b/...json/debug/lib/pkgconfig/nlohmann_json.pc → ...mann/debug/lib/pkgconfig/nlohmann_json.pc
diff --git a/..._json/include/nlohmann/adl_serializer.hpp → ...hmann/include/nlohmann/adl_serializer.hpp b/..._json/include/nlohmann/adl_serializer.hpp → ...hmann/include/nlohmann/adl_serializer.hpp
diff --git a/.../nlohmann/byte_container_with_subtype.hpp → .../nlohmann/byte_container_with_subtype.hpp b/.../nlohmann/byte_container_with_subtype.hpp → .../nlohmann/byte_container_with_subtype.hpp
diff --git a/...nlohmann/detail/conversions/from_json.hpp → ...nlohmann/detail/conversions/from_json.hpp b/...nlohmann/detail/conversions/from_json.hpp → ...nlohmann/detail/conversions/from_json.hpp
diff --git a/.../nlohmann/detail/conversions/to_chars.hpp → .../nlohmann/detail/conversions/to_chars.hpp b/.../nlohmann/detail/conversions/to_chars.hpp → .../nlohmann/detail/conversions/to_chars.hpp
diff --git a/...e/nlohmann/detail/conversions/to_json.hpp → ...e/nlohmann/detail/conversions/to_json.hpp b/...e/nlohmann/detail/conversions/to_json.hpp → ...e/nlohmann/detail/conversions/to_json.hpp
diff --git a/...on/include/nlohmann/detail/exceptions.hpp → ...nn/include/nlohmann/detail/exceptions.hpp b/...on/include/nlohmann/detail/exceptions.hpp → ...nn/include/nlohmann/detail/exceptions.hpp
diff --git a/...ann_json/include/nlohmann/detail/hash.hpp → ...nlohmann/include/nlohmann/detail/hash.hpp b/...ann_json/include/nlohmann/detail/hash.hpp → ...nlohmann/include/nlohmann/detail/hash.hpp
diff --git a/...e/nlohmann/detail/input/binary_reader.hpp → ...e/nlohmann/detail/input/binary_reader.hpp b/...e/nlohmann/detail/input/binary_reader.hpp → ...e/nlohmann/detail/input/binary_reader.hpp
diff --git a/.../nlohmann/detail/input/input_adapters.hpp → .../nlohmann/detail/input/input_adapters.hpp b/.../nlohmann/detail/input/input_adapters.hpp → .../nlohmann/detail/input/input_adapters.hpp
diff --git a/...nclude/nlohmann/detail/input/json_sax.hpp → ...nclude/nlohmann/detail/input/json_sax.hpp b/...nclude/nlohmann/detail/input/json_sax.hpp → ...nclude/nlohmann/detail/input/json_sax.hpp
diff --git a/...n/include/nlohmann/detail/input/lexer.hpp → ...n/include/nlohmann/detail/input/lexer.hpp b/...n/include/nlohmann/detail/input/lexer.hpp → ...n/include/nlohmann/detail/input/lexer.hpp
diff --git a/.../include/nlohmann/detail/input/parser.hpp → .../include/nlohmann/detail/input/parser.hpp b/.../include/nlohmann/detail/input/parser.hpp → .../include/nlohmann/detail/input/parser.hpp
diff --git a/...lude/nlohmann/detail/input/position_t.hpp → ...lude/nlohmann/detail/input/position_t.hpp b/...lude/nlohmann/detail/input/position_t.hpp → ...lude/nlohmann/detail/input/position_t.hpp
diff --git a/...nn/detail/iterators/internal_iterator.hpp → ...nn/detail/iterators/internal_iterator.hpp b/...nn/detail/iterators/internal_iterator.hpp → ...nn/detail/iterators/internal_iterator.hpp
diff --git a/...e/nlohmann/detail/iterators/iter_impl.hpp → ...e/nlohmann/detail/iterators/iter_impl.hpp b/...e/nlohmann/detail/iterators/iter_impl.hpp → ...e/nlohmann/detail/iterators/iter_impl.hpp
diff --git a/...mann/detail/iterators/iteration_proxy.hpp → ...mann/detail/iterators/iteration_proxy.hpp b/...mann/detail/iterators/iteration_proxy.hpp → ...mann/detail/iterators/iteration_proxy.hpp
diff --git a/...mann/detail/iterators/iterator_traits.hpp → ...mann/detail/iterators/iterator_traits.hpp b/...mann/detail/iterators/iterator_traits.hpp → ...mann/detail/iterators/iterator_traits.hpp
diff --git a/...etail/iterators/json_reverse_iterator.hpp → ...etail/iterators/json_reverse_iterator.hpp b/...etail/iterators/json_reverse_iterator.hpp → ...etail/iterators/json_reverse_iterator.hpp
diff --git a/...n/detail/iterators/primitive_iterator.hpp → ...n/detail/iterators/primitive_iterator.hpp b/...n/detail/iterators/primitive_iterator.hpp → ...n/detail/iterators/primitive_iterator.hpp
diff --git a/.../include/nlohmann/detail/json_pointer.hpp → .../include/nlohmann/detail/json_pointer.hpp b/.../include/nlohmann/detail/json_pointer.hpp → .../include/nlohmann/detail/json_pointer.hpp
diff --git a/...json/include/nlohmann/detail/json_ref.hpp → ...mann/include/nlohmann/detail/json_ref.hpp b/...json/include/nlohmann/detail/json_ref.hpp → ...mann/include/nlohmann/detail/json_ref.hpp
diff --git a/...n/include/nlohmann/detail/macro_scope.hpp → ...n/include/nlohmann/detail/macro_scope.hpp b/...n/include/nlohmann/detail/macro_scope.hpp → ...n/include/nlohmann/detail/macro_scope.hpp
diff --git a/...include/nlohmann/detail/macro_unscope.hpp → ...include/nlohmann/detail/macro_unscope.hpp b/...include/nlohmann/detail/macro_unscope.hpp → ...include/nlohmann/detail/macro_unscope.hpp
diff --git a/...e/nlohmann/detail/meta/call_std/begin.hpp → ...e/nlohmann/detail/meta/call_std/begin.hpp b/...e/nlohmann/detail/meta/call_std/begin.hpp → ...e/nlohmann/detail/meta/call_std/begin.hpp
diff --git a/...ude/nlohmann/detail/meta/call_std/end.hpp → ...ude/nlohmann/detail/meta/call_std/end.hpp b/...ude/nlohmann/detail/meta/call_std/end.hpp → ...ude/nlohmann/detail/meta/call_std/end.hpp
diff --git a/...clude/nlohmann/detail/meta/cpp_future.hpp → ...clude/nlohmann/detail/meta/cpp_future.hpp b/...clude/nlohmann/detail/meta/cpp_future.hpp → ...clude/nlohmann/detail/meta/cpp_future.hpp
diff --git a/...include/nlohmann/detail/meta/detected.hpp → ...include/nlohmann/detail/meta/detected.hpp b/...include/nlohmann/detail/meta/detected.hpp → ...include/nlohmann/detail/meta/detected.hpp
diff --git a/...ude/nlohmann/detail/meta/identity_tag.hpp → ...ude/nlohmann/detail/meta/identity_tag.hpp b/...ude/nlohmann/detail/meta/identity_tag.hpp → ...ude/nlohmann/detail/meta/identity_tag.hpp
diff --git a/...n/include/nlohmann/detail/meta/is_sax.hpp → ...n/include/nlohmann/detail/meta/is_sax.hpp b/...n/include/nlohmann/detail/meta/is_sax.hpp → ...n/include/nlohmann/detail/meta/is_sax.hpp
diff --git a/...lude/nlohmann/detail/meta/type_traits.hpp → ...lude/nlohmann/detail/meta/type_traits.hpp b/...lude/nlohmann/detail/meta/type_traits.hpp → ...lude/nlohmann/detail/meta/type_traits.hpp
diff --git a/...n/include/nlohmann/detail/meta/void_t.hpp → ...n/include/nlohmann/detail/meta/void_t.hpp b/...n/include/nlohmann/detail/meta/void_t.hpp → ...n/include/nlohmann/detail/meta/void_t.hpp
diff --git a/.../nlohmann/detail/output/binary_writer.hpp → .../nlohmann/detail/output/binary_writer.hpp b/.../nlohmann/detail/output/binary_writer.hpp → .../nlohmann/detail/output/binary_writer.hpp
diff --git a/...lohmann/detail/output/output_adapters.hpp → ...lohmann/detail/output/output_adapters.hpp b/...lohmann/detail/output/output_adapters.hpp → ...lohmann/detail/output/output_adapters.hpp
diff --git a/...ude/nlohmann/detail/output/serializer.hpp → ...ude/nlohmann/detail/output/serializer.hpp b/...ude/nlohmann/detail/output/serializer.hpp → ...ude/nlohmann/detail/output/serializer.hpp
diff --git a/...include/nlohmann/detail/string_escape.hpp → ...include/nlohmann/detail/string_escape.hpp b/...include/nlohmann/detail/string_escape.hpp → ...include/nlohmann/detail/string_escape.hpp
diff --git a/..._json/include/nlohmann/detail/value_t.hpp → ...hmann/include/nlohmann/detail/value_t.hpp b/..._json/include/nlohmann/detail/value_t.hpp → ...hmann/include/nlohmann/detail/value_t.hpp
diff --git a/...l/nlohmann_json/include/nlohmann/json.hpp → external/nlohmann/include/nlohmann/json.hpp b/...l/nlohmann_json/include/nlohmann/json.hpp → external/nlohmann/include/nlohmann/json.hpp
diff --git a/...ohmann_json/include/nlohmann/json_fwd.hpp → ...al/nlohmann/include/nlohmann/json_fwd.hpp b/...ohmann_json/include/nlohmann/json_fwd.hpp → ...al/nlohmann/include/nlohmann/json_fwd.hpp
diff --git a/...ann_json/include/nlohmann/ordered_map.hpp → ...nlohmann/include/nlohmann/ordered_map.hpp b/...ann_json/include/nlohmann/ordered_map.hpp → ...nlohmann/include/nlohmann/ordered_map.hpp
diff --git a/...ude/nlohmann/thirdparty/hedley/hedley.hpp → ...ude/nlohmann/thirdparty/hedley/hedley.hpp b/...ude/nlohmann/thirdparty/hedley/hedley.hpp → ...ude/nlohmann/thirdparty/hedley/hedley.hpp
diff --git a/...ohmann/thirdparty/hedley/hedley_undef.hpp → ...ohmann/thirdparty/hedley/hedley_undef.hpp b/...ohmann/thirdparty/hedley/hedley_undef.hpp → ...ohmann/thirdparty/hedley/hedley_undef.hpp
diff --git a/...hmann_json/lib/pkgconfig/nlohmann_json.pc → ...l/nlohmann/lib/pkgconfig/nlohmann_json.pc b/...hmann_json/lib/pkgconfig/nlohmann_json.pc → ...l/nlohmann/lib/pkgconfig/nlohmann_json.pc
diff --git a/.../share/nlohmann_json/nlohmann_json.natvis → .../share/nlohmann_json/nlohmann_json.natvis b/.../share/nlohmann_json/nlohmann_json.natvis → .../share/nlohmann_json/nlohmann_json.natvis
diff --git a/...e/nlohmann_json/nlohmann_jsonConfig.cmake → ...e/nlohmann_json/nlohmann_jsonConfig.cmake b/...e/nlohmann_json/nlohmann_jsonConfig.cmake → ...e/nlohmann_json/nlohmann_jsonConfig.cmake
diff --git a/...ann_json/nlohmann_jsonConfigVersion.cmake → ...ann_json/nlohmann_jsonConfigVersion.cmake b/...ann_json/nlohmann_jsonConfigVersion.cmake → ...ann_json/nlohmann_jsonConfigVersion.cmake
diff --git a/.../nlohmann_json/nlohmann_jsonTargets.cmake → .../nlohmann_json/nlohmann_jsonTargets.cmake b/.../nlohmann_json/nlohmann_jsonTargets.cmake → .../nlohmann_json/nlohmann_jsonTargets.cmake