Merge branch 'fix/vcpkg-inc'

planetchili · planetchili · commit c14ad4e43bdc · 2026-03-25T10:55:46.000+09:00
diff --git a/IntelPresentMon/CommonUtilities/Exception.h b/IntelPresentMon/CommonUtilities/Exception.h
@@ -3,7 +3,7 @@
 #include <exception>
 #include <memory>
 #include <optional>
-#include "../PresentMonAPI2/PresentMonAPI.h"
+#include <IntelPresentMon/PresentMonAPI2/PresentMonAPI.h>
 
 namespace pmon::util
 {
diff --git a/IntelPresentMon/CommonUtilities/mc/FrameMetricsMemberMap.h b/IntelPresentMon/CommonUtilities/mc/FrameMetricsMemberMap.h
@@ -3,7 +3,7 @@
 #pragma once
 #include <optional>
 #include "MetricsTypes.h"
-#include "../PresentMonAPI2/PresentMonAPI.h"
+#include <IntelPresentMon/PresentMonAPI2/PresentMonAPI.h>
 
 namespace pmon::util::metrics
 {
diff --git a/IntelPresentMon/CommonUtilities/mc/MetricsCalculator.cpp b/IntelPresentMon/CommonUtilities/mc/MetricsCalculator.cpp
@@ -3,7 +3,7 @@
 #include "MetricsCalculator.h"
 #include "MetricsCalculatorInternal.h"
 
-#include "../PresentData/PresentMonTraceConsumer.hpp"
+#include <PresentData/PresentMonTraceConsumer.hpp>
 #include "../Math.h"
 
 // Layout: internal helpers -> entry points -> metric assembly -> exported helpers
diff --git a/IntelPresentMon/CommonUtilities/mc/MetricsCalculatorAnimation.cpp b/IntelPresentMon/CommonUtilities/mc/MetricsCalculatorAnimation.cpp
@@ -3,7 +3,7 @@
 #include "MetricsCalculator.h"
 #include "MetricsCalculatorInternal.h"
 
-#include "../PresentData/PresentMonTraceConsumer.hpp"
+#include <PresentData/PresentMonTraceConsumer.hpp>
 #include "../Math.h"
 
 namespace pmon::util::metrics
diff --git a/IntelPresentMon/CommonUtilities/mc/MetricsCalculatorCpuGpu.cpp b/IntelPresentMon/CommonUtilities/mc/MetricsCalculatorCpuGpu.cpp
@@ -3,7 +3,7 @@
 #include "MetricsCalculator.h"
 #include "MetricsCalculatorInternal.h"
 
-#include "../PresentData/PresentMonTraceConsumer.hpp"
+#include <PresentData/PresentMonTraceConsumer.hpp>
 #include "../Math.h"
 
 namespace pmon::util::metrics
diff --git a/IntelPresentMon/CommonUtilities/mc/MetricsCalculatorDisplay.cpp b/IntelPresentMon/CommonUtilities/mc/MetricsCalculatorDisplay.cpp
@@ -3,7 +3,7 @@
 #include "MetricsCalculator.h"
 #include "MetricsCalculatorInternal.h"
 
-#include "../PresentData/PresentMonTraceConsumer.hpp"
+#include <PresentData/PresentMonTraceConsumer.hpp>
 #include "../Math.h"
 
 namespace pmon::util::metrics
diff --git a/IntelPresentMon/CommonUtilities/mc/MetricsCalculatorInput.cpp b/IntelPresentMon/CommonUtilities/mc/MetricsCalculatorInput.cpp
@@ -3,7 +3,7 @@
 #include "MetricsCalculator.h"
 #include "MetricsCalculatorInternal.h"
 
-#include "../PresentData/PresentMonTraceConsumer.hpp"
+#include <PresentData/PresentMonTraceConsumer.hpp>
 #include "../Math.h"
 
 namespace pmon::util::metrics
diff --git a/IntelPresentMon/CommonUtilities/mc/MetricsCalculatorInstrumented.cpp b/IntelPresentMon/CommonUtilities/mc/MetricsCalculatorInstrumented.cpp
@@ -3,7 +3,7 @@
 #include "MetricsCalculator.h"
 #include "MetricsCalculatorInternal.h"
 
-#include "../PresentData/PresentMonTraceConsumer.hpp"
+#include <PresentData/PresentMonTraceConsumer.hpp>
 #include "../Math.h"
 
 namespace pmon::util::metrics
diff --git a/IntelPresentMon/CommonUtilities/mc/MetricsTypes.cpp b/IntelPresentMon/CommonUtilities/mc/MetricsTypes.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 #include "MetricsTypes.h"
 
-#include "../PresentData/PresentMonTraceConsumer.hpp"
+#include <PresentData/PresentMonTraceConsumer.hpp>
 
 namespace pmon::util::metrics {
 
diff --git a/IntelPresentMon/CommonUtilities/mc/MetricsTypes.h b/IntelPresentMon/CommonUtilities/mc/MetricsTypes.h
@@ -7,7 +7,7 @@
 #include <memory>
 #include <optional>
 #include "../cnr/FixedVector.h"
-#include "../../../PresentData/PresentEventEnums.hpp"
+#include <PresentData/PresentEventEnums.hpp>
 
 // Forward declarations for external types
 struct PresentEvent; // From PresentMonTraceConsumer
diff --git a/IntelPresentMon/CommonUtilities/mc/SwapChainState.cpp b/IntelPresentMon/CommonUtilities/mc/SwapChainState.cpp
@@ -1,7 +1,7 @@
 ﻿// Copyright (C) 2025 Intel Corporation
 // SPDX-License-Identifier: MIT
 #include "SwapChainState.h"
-#include "../PresentData/PresentMonTraceConsumer.hpp"
+#include <PresentData/PresentMonTraceConsumer.hpp>
 
 namespace pmon::util::metrics {
 
diff --git a/IntelPresentMon/CommonUtilities/mc/UnifiedSwapChain.cpp b/IntelPresentMon/CommonUtilities/mc/UnifiedSwapChain.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 #include "MetricsTypes.h"
 #include "UnifiedSwapChain.h"
-#include "../PresentData/PresentMonTraceConsumer.hpp"
+#include <PresentData/PresentMonTraceConsumer.hpp>
 
 #include <algorithm>
 
diff --git a/IntelPresentMon/CommonUtilities/ref/gen/GeneratedReflection.h b/IntelPresentMon/CommonUtilities/ref/gen/GeneratedReflection.h
@@ -10,7 +10,7 @@
 #include "../GeneratedReflectionHelpers.h"
 
 // target includes
-#include "../../../../IntelPresentMon/ControlLib/igcl_api.h"
+#include <IntelPresentMon/ControlLib/igcl_api.h>
 
 namespace pmon::util::ref::gen
 {
diff --git a/IntelPresentMon/Interprocess/Interprocess.vcxproj b/IntelPresentMon/Interprocess/Interprocess.vcxproj
@@ -140,7 +140,7 @@
       <AdditionalOptions>/we4062</AdditionalOptions>
       <ExceptionHandling>Async</ExceptionHandling>
       <LanguageStandard>stdcpplatest</LanguageStandard>
-      <AdditionalIncludeDirectories>..\..\build\obj\generated</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\build\obj\generated;..\..</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>
@@ -161,7 +161,7 @@
       <AdditionalOptions>/we4062</AdditionalOptions>
       <ExceptionHandling>Async</ExceptionHandling>
       <LanguageStandard>stdcpplatest</LanguageStandard>
-      <AdditionalIncludeDirectories>..\..\build\obj\generated</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\build\obj\generated;..\..</AdditionalIncludeDirectories>
       <ControlFlowGuard>Guard</ControlFlowGuard>
     </ClCompile>
     <Link>

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#include <exception>`
`4`	`4`	`#include <memory>`
`5`	`5`	`#include <optional>`
`6`		`-#include "../PresentMonAPI2/PresentMonAPI.h"`
	`6`	`+#include <IntelPresentMon/PresentMonAPI2/PresentMonAPI.h>`
`7`	`7`
`8`	`8`	`namespace pmon::util`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#pragma once`
`4`	`4`	`#include <optional>`
`5`	`5`	`#include "MetricsTypes.h"`
`6`		`-#include "../PresentMonAPI2/PresentMonAPI.h"`
	`6`	`+#include <IntelPresentMon/PresentMonAPI2/PresentMonAPI.h>`
`7`	`7`
`8`	`8`	`namespace pmon::util::metrics`
`9`	`9`	`{`