Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThomsonTan merged 8 commits into from
Feb 6, 2025
Merged

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

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7d0eac6
Copy json.hpp from lib\include\mat => nlohmann\ update include paths …
mkoscumb Feb 3, 2025
964cbe0
Update CmakeLists.txt to include the repo root directory to the inclu…
mkoscumb Feb 3, 2025
c663483
Use CMAKE_SOURCE_DIR not CMAKE_CURRENT_SOURCE_DIR for the top-level d…
mkoscumb Feb 3, 2025
2c0455b
Merge branch 'main' into mkoscumb/MoveJsonHppStage1
lalitb Feb 3, 2025
7f1641f
Update Android build logic to look at sdk_root for include paths.
mkoscumb Feb 3, 2025
cb98483
Merge branch 'mkoscumb/MoveJsonHppStage1' of https://github.com/micro…
mkoscumb Feb 3, 2025
497ca6e
Update Android TestApp Nativebuild logic to look at sdk_root for incl…
mkoscumb Feb 4, 2025
415c6bf
Update spelling of nlohmann in CMakeLists.txt
mkoscumb Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,9 @@ include_directories(lib/pal)
# add_subdirectory(bondlite/tests)
#endif()

# Include repo root to allow includes of sqlite, zlib, and nlhomann
include_directories(${CMAKE_SOURCE_DIR})

if(BUILD_HEADERS)
add_subdirectory(lib/include)
endif()
Expand Down
4 changes: 2 additions & 2 deletions Solutions/Clienttelemetry/Clienttelemetry.vcxitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\..</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down Expand Up @@ -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" />
Expand Down Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion Solutions/Clienttelemetry/Clienttelemetry.vcxitems.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions lib/android_build/app/src/main/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions lib/android_build/maesdk/src/main/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})


Expand Down
2 changes: 1 addition & 1 deletion lib/api/LogConfiguration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "LogConfiguration.hpp"

#ifdef HAVE_MAT_JSONHPP
#include <json.hpp>
#include <nlohmann/json.hpp>
using json = nlohmann::json;
#endif

Expand Down
2 changes: 1 addition & 1 deletion lib/decoder/PayloadDecoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/http/HttpResponseDecoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <cassert>

#ifdef HAVE_MAT_JSONHPP
#include "json.hpp"
#include <nlohmann/json.hpp>
#endif

namespace MAT_NS_BEGIN {
Expand Down
2 changes: 1 addition & 1 deletion lib/system/JsonFormatter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
#include "JsonFormatter.hpp"
#include "CorrelationVector.hpp"
#include "json.hpp"
#include <nlohmann/json.hpp>

using json = nlohmann::json;

Expand Down
2 changes: 1 addition & 1 deletion lib/tpm/TransmitProfiles.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "pal/PAL.hpp"

#ifdef HAVE_MAT_JSONHPP
#include "json.hpp"
#include <nlohmann/json.hpp>
#endif

#include "utils/Utils.hpp"
Expand Down
Loading
Loading