deps: also update json.hpp, same issue with tons of warnings

This commit is contained in:
Tyler Wilding
2026-03-17 22:23:11 -04:00
parent 200574e7de
commit 7567cc8836
3 changed files with 3106 additions and 1871 deletions
+6 -7
View File
@@ -181,16 +181,15 @@ endif()
function(build_third_party_lib dir_name target_name)
add_subdirectory(third-party/${dir_name} EXCLUDE_FROM_ALL)
if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
# For Microsoft Visual C++ Compiler (MSVC)
target_compile_options(${target_name} PRIVATE /w)
elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
# For GNU Compiler Collection (GCC) or Clang
target_compile_options(${target_name} PRIVATE -w)
# Convert all public include dirs to SYSTEM
get_target_property(INCLUDES ${target_name} INTERFACE_INCLUDE_DIRECTORIES)
if(INCLUDES)
set_target_properties(${target_name} PROPERTIES
INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${INCLUDES}"
)
endif()
endfunction()
# Dependencies and Libraries
# includes relative to top level jak-project folder
include_directories(./)
Generated Vendored
+3098 -1864
View File
File diff suppressed because it is too large Load Diff
+2
View File
@@ -51,3 +51,5 @@ third-party/draco:
modifications:
- https://github.com/google/draco/pull/987
- "PR #3723 (https://github.com/open-goal/jak-project/pull/3723)"
third-party/json.hpp
git: https://github.com/nlohmann/json/blob/eba0a92bfb1abf242f30e894b96ba11c9f4048c7/single_include/nlohmann/json.hpp