projects / packages / vtk.git / blame
| Commit | Line | Data |
|---|---|---|
| 9a15f8c1 JR |
1 | --- VTK-6.1.0/ThirdParty/jsoncpp/vtk_jsoncpp.h.in~ 2014-01-22 16:55:41.000000000 +0100 |
| 2 | +++ VTK-6.1.0/ThirdParty/jsoncpp/vtk_jsoncpp.h.in 2015-03-11 21:12:09.859743052 +0100 | |
| 3 | @@ -18,7 +18,7 @@ | |
| 4 | /* Use the JsonCpp library configured for VTK. */ | |
| 5 | #cmakedefine VTK_USE_SYSTEM_JSONCPP | |
| 6 | #ifdef VTK_USE_SYSTEM_JSONCPP | |
| 7 | -# include <json/json.h> | |
| 8 | +# include <jsoncpp/json.h> | |
| 9 | # ifndef JSON_FORWARDS_H_INCLUDED | |
| 10 | # error Incorrect header included, check your include paths for conflicts | |
| 11 | # endif | |
| 12 | --- VTK-6.1.0/ThirdParty/jsoncpp/vtkjsoncpp/jsoncpp.cpp~ 2014-01-22 16:55:41.000000000 +0100 | |
| 13 | +++ VTK-6.1.0/ThirdParty/jsoncpp/vtkjsoncpp/jsoncpp.cpp 2015-03-11 21:13:12.856409262 +0100 | |
| 14 | @@ -75,7 +75,7 @@ | |
| 15 | ||
| 16 | ||
| 17 | ||
| 18 | -#include "json/json.h" | |
| 19 | +#include "jsoncpp/json.h" | |
| 20 | ||
| 21 | ||
| 22 | // ////////////////////////////////////////////////////////////////////// | |
| 23 | @@ -195,8 +195,8 @@ | |
| 24 | // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE | |
| 25 | ||
| 26 | #if !defined(JSON_IS_AMALGAMATION) | |
| 27 | -# include <json/reader.h> | |
| 28 | -# include <json/value.h> | |
| 29 | +# include <jsoncpp/reader.h> | |
| 30 | +# include <jsoncpp/value.h> | |
| 31 | # include "json_tool.h" | |
| 32 | #endif // if !defined(JSON_IS_AMALGAMATION) | |
| 33 | #include <utility> | |
| 34 | @@ -1546,8 +1546,8 @@ | |
| 35 | // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE | |
| 36 | ||
| 37 | #if !defined(JSON_IS_AMALGAMATION) | |
| 38 | -# include <json/value.h> | |
| 39 | -# include <json/writer.h> | |
| 40 | +# include <jsoncpp/value.h> | |
| 41 | +# include <jsoncpp/writer.h> | |
| 42 | # ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR | |
| 43 | # include "json_batchallocator.h" | |
| 44 | # endif // #ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR | |
| 45 | @@ -3398,7 +3398,7 @@ | |
| 46 | // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE | |
| 47 | ||
| 48 | #if !defined(JSON_IS_AMALGAMATION) | |
| 49 | -# include <json/writer.h> | |
| 50 | +# include <jsoncpp/writer.h> | |
| 51 | # include "json_tool.h" | |
| 52 | #endif // if !defined(JSON_IS_AMALGAMATION) | |
| 53 | #include <utility> | |
| 54 | --- VTK-6.1.0/CMake/FindJsonCpp.cmake.orig 2014-01-22 16:55:41.000000000 +0100 | |
| 55 | +++ VTK-6.1.0/CMake/FindJsonCpp.cmake 2015-03-11 21:15:27.929741618 +0100 | |
| 56 | @@ -8,8 +8,7 @@ | |
| 57 | # JsonCpp_LIBRARIES - the libraries to link against to use JsonCpp | |
| 58 | # JsonCpp_FOUND - if false the library was not found. | |
| 59 | ||
| 60 | -find_path(JsonCpp_INCLUDE_DIR "json/json.h" | |
| 61 | - PATH_SUFFIXES "jsoncpp" | |
| 62 | +find_path(JsonCpp_INCLUDE_DIR "jsoncpp/json.h" | |
| 63 | DOC "Specify the JsonCpp include directory here") | |
| 64 | ||
| 65 | find_library(JsonCpp_LIBRARY |