Move json.hpp to a peer folder of other third-party dependencies - Stage 1 (#1325)

Author: mkoscumb

CMakeLists.txt

@@ -301,6 +301,9 @@ include_directories(lib/pal)
 #  add_subdirectory(bondlite/tests)
 #endif()
 
+# Include repo root to allow includes of sqlite, zlib, and nlohmann
+include_directories(${CMAKE_SOURCE_DIR})
+
 if(BUILD_HEADERS)
   add_subdirectory(lib/include)
 endif()

Solutions/Clienttelemetry/Clienttelemetry.vcxitems

@@ -8,7 +8,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\..</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -115,7 +115,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\INetworkInformation.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\IPropertyChangedCallback.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\ISystemInformation.hpp" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\json.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\oacr.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\TransmitProfiles.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\CommonFields.h" />
@@ -201,6 +200,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\StringUtils.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\ZlibUtils.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\Utils.hpp" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\nlohmann\json.hpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\Version.hpp.template" />

Solutions/Clienttelemetry/Clienttelemetry.vcxitems.filters

@@ -100,7 +100,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\INetworkInformation.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\IPropertyChangedCallback.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\ISystemInformation.hpp" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\json.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\oacr.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\TransmitProfiles.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\CommonFields.h" />
@@ -189,6 +188,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\StringUtils.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\ZlibUtils.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\Utils.hpp" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\nlohmann\json.hpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\Version.hpp.template" />

lib/android_build/app/src/main/cpp/CMakeLists.txt

@@ -19,6 +19,7 @@ include_directories(AFTER
         ${SDK_ROOT}/lib/include/mat
         ${SDK_ROOT}/sqlite
         ${SDK_ROOT}lib/pal
+        ${SDK_ROOT}
         "${gmock_dir}/include"
         "${gmock_dir}"
         "${gtest_dir}/include"

lib/android_build/maesdk/src/main/cpp/CMakeLists.txt

@@ -142,6 +142,7 @@ target_include_directories(${TARGETNAME} PUBLIC
         ${SDK_ROOT}/lib/include/mat
         ${SDK_ROOT}/sqlite
         ${SDK_ROOT}lib/pal
+        ${SDK_ROOT}
         ${CURL_INCLUDE_DIRS})
 
 

lib/api/LogConfiguration.cpp

@@ -6,7 +6,7 @@
 #include "LogConfiguration.hpp"
 
 #ifdef HAVE_MAT_JSONHPP
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 using json = nlohmann::json;
 #endif
 

lib/decoder/PayloadDecoder.cpp

@@ -44,7 +44,7 @@ MAT_NS_END
 #endif
 
 /* PayloadDecoder functionality requires json.hpp library */
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 /* Bond definition of CsProtocol::Record is auto-generated and could be different for each SDK version */
 #include "bond/All.hpp"

lib/http/HttpResponseDecoder.cpp

@@ -11,7 +11,7 @@
 #include <cassert>
 
 #ifdef HAVE_MAT_JSONHPP
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 #endif
 
 namespace MAT_NS_BEGIN {

lib/system/JsonFormatter.cpp

@@ -4,7 +4,7 @@
 //
 #include "JsonFormatter.hpp"
 #include "CorrelationVector.hpp"
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 

lib/tpm/TransmitProfiles.cpp

@@ -7,7 +7,7 @@
 #include "pal/PAL.hpp"
 
 #ifdef HAVE_MAT_JSONHPP
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 #endif
 
 #include "utils/Utils.hpp"