bump vcpkg baseline and fix include paths for concurrentqueue

planetchili · planetchili · commit e7dd0c4daf2f · 2025-09-23T17:35:33.000+09:00
diff --git a/IntelPresentMon/CommonUtilities/log/Channel.cpp b/IntelPresentMon/CommonUtilities/log/Channel.cpp
@@ -3,7 +3,7 @@
 #include "IDriver.h"
 #include "IChannelObject.h"
 #include "Entry.h"
-#include <concurrentqueue/blockingconcurrentqueue.h>
+#include <concurrentqueue/moodycamel/blockingconcurrentqueue.h>
 #include <variant>
 #include <semaphore>
 #include "PanicLogger.h"
diff --git a/IntelPresentMon/CommonUtilities/log/DiagnosticDriver.h b/IntelPresentMon/CommonUtilities/log/DiagnosticDriver.h
@@ -4,7 +4,7 @@
 #include <IntelPresentMon/PresentMonAPI2/PresentMonDiagnostics.h>
 #include "../win/Event.h"
 #include <atomic>
-#include <concurrentqueue/concurrentqueue.h>
+#include <concurrentqueue/moodycamel/concurrentqueue.h>
 #include "Entry.h"
 
 
diff --git a/IntelPresentMon/CommonUtilities/log/NamedPipeMarshallSender.cpp b/IntelPresentMon/CommonUtilities/log/NamedPipeMarshallSender.cpp
@@ -11,7 +11,7 @@
 #include <ranges>
 #include "EntryCereal.h"
 #include <cereal/archives/binary.hpp>
-#include <concurrentqueue/concurrentqueue.h>
+#include <concurrentqueue/moodycamel/concurrentqueue.h>
 #include "MarshallingProtocol.h"
 #include "../Exception.h"
 #include "PanicLogger.h"
diff --git a/IntelPresentMon/CommonUtilities/vcpkg-configuration.json b/IntelPresentMon/CommonUtilities/vcpkg-configuration.json
@@ -1,7 +1,7 @@
 {
   "default-registry": {
     "kind": "git",
-    "baseline": "dd3097e305afa53f7b4312371f62058d2e665320",
+    "baseline": "120deac3062162151622ca4860575a33844ba10b",
     "repository": "https://github.com/microsoft/vcpkg"
   },
   "registries": [
diff --git a/PresentMon.sln b/PresentMon.sln
@@ -68,6 +68,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{B4CC58
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
 		IntelPresentMon\metrics.csv = IntelPresentMon\metrics.csv
+		vcpkg-configuration.json = vcpkg-configuration.json
 		vcpkg.json = vcpkg.json
 	EndProjectSection
 EndProject
diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -1,7 +1,7 @@
 {
   "default-registry": {
     "kind": "git",
-    "baseline": "dd3097e305afa53f7b4312371f62058d2e665320",
+    "baseline": "120deac3062162151622ca4860575a33844ba10b",
     "repository": "https://github.com/microsoft/vcpkg"
   },
   "registries": [

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"default-registry": {`
`3`	`3`	`"kind": "git",`
`4`		`- "baseline": "dd3097e305afa53f7b4312371f62058d2e665320",`
	`4`	`+ "baseline": "120deac3062162151622ca4860575a33844ba10b",`
`5`	`5`	`"repository": "https://github.com/microsoft/vcpkg"`
`6`	`6`	`},`
`7`	`7`	`"registries": [`