Skip to content

Commit

Permalink
Upgrade jsoncpp (#773)
Browse files Browse the repository at this point in the history
Fixes #772 

Upgrade version of jsoncpp to 1.9.5 to include fix for deprecated sprintf usage.

Upgrading introduced a new unneeded-internal-declaration warning which is set as a warning instead of error.

Signed-off-by: The MathWorks, Inc. <jdicleme@mathworks.com>

Signed-off-by: The MathWorks, Inc. <jdicleme@mathworks.com>
Co-authored-by: Jeff DiClemente <jdicleme@mathworks.com>
  • Loading branch information
jeffdiclemente and Jeff DiClemente committed Dec 21, 2022
1 parent 990a832 commit 0182203
Show file tree
Hide file tree
Showing 8 changed files with 3,142 additions and 2,193 deletions.
4 changes: 4 additions & 0 deletions compendium/tools/SCRCodeGen/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ include_directories(../../../third_party
set(US_SCRCODEGEN_EXECUTABLE_TARGET SCRCodeGen)
set(US_SCRCODEGEN_EXECUTABLE_OUTPUT_NAME ${US_SCRCODEGEN_EXECUTABLE_TARGET}${US_GLOBAL_VERSION_SUFFIX})

if(US_COMPILER_CLANG OR US_COMPILER_APPLE_CLANG)
add_compile_options(-Wno-error=unneeded-internal-declaration)
endif()

add_executable(${US_SCRCODEGEN_EXECUTABLE_TARGET} ${_srcs} ${_private_headers})
if (US_BUILD_TESTING)
target_compile_definitions(${US_SCRCODEGEN_EXECUTABLE_TARGET} PRIVATE USING_GTEST)
Expand Down
1 change: 0 additions & 1 deletion framework/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ set(_srcs
bundle/BundleVersion.cpp
bundle/Constants.cpp
bundle/CoreBundleContext.cpp
../../third_party/jsoncpp.cpp
../../third_party/miniz.c
)

Expand Down
4 changes: 4 additions & 0 deletions framework/test/gtest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/TestingConfig.h.in" "${PROJECT_BINAR

set(us_gtest_test_exe_name usFrameworkTests)

if(US_COMPILER_CLANG OR US_COMPILER_APPLE_CLANG)
add_compile_options(-Wno-error=unneeded-internal-declaration)
endif()

include_directories(
${GTEST_INCLUDE_DIRS}
${GMOCK_INCLUDE_DIRS}
Expand Down
5 changes: 1 addition & 4 deletions third_party/README
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,8 @@ MIT License or Public Domain

https://github.com/open-source-parsers/jsoncpp
(formerly http://jsoncpp.sourceforge.net)
0.10.6
1.9.5

Patches

* Suppress -Wimplicit-fallthrough warning in GCC 7

miniz
-----
Expand Down

0 comments on commit 0182203

Please sign in to comment.