Merge pull request #1395 from mavlink/update-jsoncpp

Update jsoncpp
mavlink · May 5, 2021 · 769e495 · 769e495
2 parents 9ea7c8e + 3c5d72f
commit 769e495
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 104 deletions.
diff --git a/src/cmake/Modules/FindJsonCpp.cmake → src/cmake/Modules/Findjsoncpp.cmake b/src/cmake/Modules/FindJsonCpp.cmake → src/cmake/Modules/Findjsoncpp.cmake
@@ -1,13 +1,13 @@
 find_package(jsoncpp CONFIG QUIET)
 
-if(NOT TARGET JsonCpp::jsoncpp)
+if(NOT TARGET JsonCpp::JsonCpp)
     if(JsonCpp_FOUND)
         message(STATUS "Found jsoncpp via config file: ${JsonCpp_DIR}")
         if(NOT JsonCpp_LIBRARY)
-            if(TARGET JsonCpp)
-                set(JsonCpp_LIBRARY JsonCpp)
-            elseif(TARGET JsonCpp::jsoncpp)
-                set(JsonCpp_LIBRARY JsonCpp::jsoncpp)
+            if(TARGET jsoncpp)
+                set(JsonCpp_LIBRARY jsoncpp)
+            elseif(TARGET JsonCpp::JsonCpp)
+                set(JsonCpp_LIBRARY JsonCpp::JsonCpp)
             endif()
         endif()
     else()
@@ -18,7 +18,7 @@ if(NOT TARGET JsonCpp::jsoncpp)
         if(PKG_CONFIG_FOUND)
             pkg_check_modules(PC_JSONCPP QUIET IMPORTED_TARGET GLOBAL jsoncpp)
             if(PC_JSONCPP_FOUND)
-                add_library(JsonCpp::jsoncpp ALIAS PkgConfig::PC_JSONCPP)
+                add_library(JsonCpp::JsonCpp ALIAS PkgConfig::PC_JSONCPP)
             endif()
         endif()
 
@@ -38,8 +38,8 @@ if(NOT TARGET JsonCpp::jsoncpp)
     endif()
 
     if (JsonCpp_FOUND)
-        add_library(JsonCpp::jsoncpp INTERFACE IMPORTED)
-        set_target_properties(JsonCpp::jsoncpp PROPERTIES
+        add_library(JsonCpp::JsonCpp INTERFACE IMPORTED)
+        set_target_properties(JsonCpp::JsonCpp PROPERTIES
             INTERFACE_INCLUDE_DIRECTORIES "${JsonCpp_INCLUDE_DIR}"
             INTERFACE_LINK_LIBRARIES "${JsonCpp_LIBRARY}")
         if(NOT JsonCpp_LIBRARY)

diff --git a/src/cmake/unit_tests.cmake b/src/cmake/unit_tests.cmake
@@ -1,7 +1,7 @@
 include_directories(${PROJECT_SOURCE_DIR}/core)
 include_directories(${PROJECT_SOURCE_DIR}/third_party/mavlink/include)
 
-find_package(JsonCpp REQUIRED)
+find_package(jsoncpp REQUIRED)
 
 add_executable(unit_tests_runner
     ${UNIT_TEST_SOURCES}
@@ -20,7 +20,7 @@ target_link_libraries(unit_tests_runner
     mavsdk_calibration
     mavsdk_telemetry
     CURL::libcurl
-    JsonCpp::jsoncpp
+    JsonCpp::JsonCpp
     gtest
     gtest_main
     gmock

diff --git a/src/plugins/mission/CMakeLists.txt b/src/plugins/mission/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(JsonCpp REQUIRED)
+find_package(jsoncpp REQUIRED)
 
 add_library(mavsdk_mission
     mission.cpp
@@ -19,7 +19,7 @@ target_link_libraries(mavsdk_mission
     PUBLIC
     mavsdk
     PRIVATE
-    JsonCpp::jsoncpp
+    JsonCpp::JsonCpp
 )
 
 target_include_directories(mavsdk_mission PUBLIC

diff --git a/src/plugins/mission_raw/CMakeLists.txt b/src/plugins/mission_raw/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(JsonCpp REQUIRED)
+find_package(jsoncpp REQUIRED)
 
 add_library(mavsdk_mission_raw
     mission_raw.cpp
@@ -20,7 +20,7 @@ target_link_libraries(mavsdk_mission_raw
     PUBLIC
     mavsdk
     PRIVATE
-    JsonCpp::jsoncpp
+    JsonCpp::JsonCpp
 )
 
 target_include_directories(mavsdk_mission_raw PUBLIC

diff --git a/third_party/jsoncpp/CMakeLists.txt b/third_party/jsoncpp/CMakeLists.txt
@@ -29,8 +29,7 @@ endforeach()
 ExternalProject_Add(
     jsoncpp
     GIT_REPOSITORY https://github.com/open-source-parsers/jsoncpp
-    GIT_TAG 1.8.4
+    GIT_TAG ed1ab7ac452b0fe51f3b0a8364770774175a060e
     PREFIX jsoncpp
-    PATCH_COMMAND git checkout . && git apply ${PROJECT_SOURCE_DIR}/fixlibname.patch && git apply ${PROJECT_SOURCE_DIR}/fix_werror.patch
     CMAKE_ARGS "${CMAKE_ARGS}"
     )
diff --git a/third_party/jsoncpp/fix_werror.patch b/third_party/jsoncpp/fix_werror.patch
diff --git a/third_party/jsoncpp/fixlibname.patch b/third_party/jsoncpp/fixlibname.patch