Fix debug build with vcpkg (#5430)

yao-msft · web-flow · commit 48de219db689 · 2025-05-02T19:19:53.000-07:00
diff --git a/src/VcpkgCustomTriplets/arm64-release-static.cmake b/src/VcpkgCustomTriplets/arm64-release-static.cmake
@@ -1,2 +1,4 @@
-include("${CMAKE_CURRENT_SOURCE_DIR}/arm64.cmake")
+include("${CMAKE_CURRENT_SOURCE_DIR}/common.cmake")
+set(VCPKG_TARGET_ARCHITECTURE arm64)
 set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_BUILD_TYPE release)
diff --git a/src/VcpkgCustomTriplets/arm64-release.cmake b/src/VcpkgCustomTriplets/arm64-release.cmake
@@ -1,2 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/arm64.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/common.cmake")
+set(VCPKG_TARGET_ARCHITECTURE arm64)
 set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_BUILD_TYPE release)
diff --git a/src/VcpkgCustomTriplets/arm64.cmake b/src/VcpkgCustomTriplets/arm64.cmake
@@ -1,2 +1,3 @@
 include("${CMAKE_CURRENT_LIST_DIR}/common.cmake")
 set(VCPKG_TARGET_ARCHITECTURE arm64)
+set(VCPKG_CRT_LINKAGE dynamic)
diff --git a/src/VcpkgCustomTriplets/common.cmake b/src/VcpkgCustomTriplets/common.cmake
@@ -1,5 +1,4 @@
 set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_C_FLAGS "/Qspectre /W3 /guard:cf")
 set(VCPKG_CXX_FLAGS "/Qspectre /W3 /guard:cf")
-set(VCPKG_BUILD_TYPE release)
 set(VCPKG_INSTALL_OPTIONS, "--debug")
diff --git a/src/VcpkgCustomTriplets/x64-release-static.cmake b/src/VcpkgCustomTriplets/x64-release-static.cmake
@@ -1,2 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/x64.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/common.cmake")
+set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_BUILD_TYPE release)
diff --git a/src/VcpkgCustomTriplets/x64-release.cmake b/src/VcpkgCustomTriplets/x64-release.cmake
@@ -1,2 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/x64.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/common.cmake")
+set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_BUILD_TYPE release)
diff --git a/src/VcpkgCustomTriplets/x64.cmake b/src/VcpkgCustomTriplets/x64.cmake
@@ -1,2 +1,3 @@
 include("${CMAKE_CURRENT_LIST_DIR}/common.cmake")
 set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE dynamic)
diff --git a/src/VcpkgCustomTriplets/x86-release-static.cmake b/src/VcpkgCustomTriplets/x86-release-static.cmake
@@ -1,2 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/x86.cmake")
-set(VCPKG_CRT_LINKAGE dynamic)
+include("${CMAKE_CURRENT_LIST_DIR}/common.cmake")
+set(VCPKG_TARGET_ARCHITECTURE x86)
+set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_BUILD_TYPE release)
diff --git a/src/VcpkgCustomTriplets/x86-release.cmake b/src/VcpkgCustomTriplets/x86-release.cmake
@@ -1,2 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/x86.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/common.cmake")
+set(VCPKG_TARGET_ARCHITECTURE x86)
 set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_BUILD_TYPE release)
diff --git a/src/VcpkgCustomTriplets/x86.cmake b/src/VcpkgCustomTriplets/x86.cmake
@@ -1,2 +1,3 @@
 include("${CMAKE_CURRENT_LIST_DIR}/common.cmake")
 set(VCPKG_TARGET_ARCHITECTURE x86)
+set(VCPKG_CRT_LINKAGE dynamic)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`include("${CMAKE_CURRENT_LIST_DIR}/common.cmake")`
`2`	`2`	`set(VCPKG_TARGET_ARCHITECTURE arm64)`
	`3`	`+set(VCPKG_CRT_LINKAGE dynamic)`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`include("${CMAKE_CURRENT_LIST_DIR}/common.cmake")`
`2`	`2`	`set(VCPKG_TARGET_ARCHITECTURE x64)`
	`3`	`+set(VCPKG_CRT_LINKAGE dynamic)`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`include("${CMAKE_CURRENT_LIST_DIR}/common.cmake")`
`2`	`2`	`set(VCPKG_TARGET_ARCHITECTURE x86)`
	`3`	`+set(VCPKG_CRT_LINKAGE dynamic)`