Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions trinity/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2140,6 +2140,7 @@ endif()
if(BUILD_TESTING)
find_package(GTest CONFIG REQUIRED)
find_package(Python3 COMPONENTS Interpreter REQUIRED)
include(GoogleTest)

# Find exefile tool, which is used to run the tests
if (DEFINED CMAKE_BUILD_TYPE AND NOT CMAKE_BUILD_TYPE MATCHES "Release")
Expand Down
5 changes: 3 additions & 2 deletions vcpkg-configuration.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
{
"default-registry": {
"kind": "git",
"baseline": "242ac6932a9cd2607332969129e9572516f28d65",
"baseline": "afa249f12f52ed8a3b919f195495ba8b330288d1",
"repository": "https://github.com/microsoft/vcpkg.git"
},
"registries": [
{
"kind": "git",
"repository": "https://github.com/carbonengine/vcpkg-registry.git",
"baseline": "a83134805f3fa07da6a6add87c4b250d9778bfd1",
"baseline": "853ee39d8b2ff4264ef24fa01434e4cbea108ee5",
"packages": [
"python3",
"carbon-*",
"tracy",
"greenlet",
"ccp-debug-info",
"crashpad",
"directx-dxc",
"zlib",
"re2c",
"amd-fidelityfx",
Expand Down
12 changes: 6 additions & 6 deletions vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
},
{
"name": "carbon-blue",
"version>=": "6.2.0"
"version>=": "6.3.1"
},
{
"name": "carbon-math",
Expand Down Expand Up @@ -104,7 +104,7 @@
},
{
"name": "directx-dxc",
"version>=": "2023-03-01#2",
"version>=": "2026-05-27",
"platform": "windows & x64"
}
]
Expand All @@ -115,7 +115,7 @@
"dependencies": [
{
"name": "directx-dxc",
"version>=": "2023-03-01#2"
"version>=": "2026-05-27"
},
{
"name": "fxc",
Expand All @@ -142,7 +142,7 @@
"dependencies": [
{
"name": "directx-dxc",
"version>=": "2023-03-01#2"
"version>=": "2026-05-27"
},
{
"name": "fxc",
Expand Down Expand Up @@ -193,8 +193,8 @@
},
"overrides": [
{
"name": "openssl",
"version": "1.1.1k#8"
"name": "imgui",
"version": "1.91.9"
},
{
"name": "libpng",
Expand Down
Loading