Remove Abseil dependency from vcpkg.json and clear overrides section to simplify project configuration.
This commit is contained in:
6
.github/workflows/release.yml
vendored
6
.github/workflows/release.yml
vendored
@@ -171,7 +171,7 @@ jobs:
|
|||||||
# Install Homebrew dependencies needed for UI tests and full builds
|
# Install Homebrew dependencies needed for UI tests and full builds
|
||||||
brew install pkg-config libpng boost abseil ninja gtk+3
|
brew install pkg-config libpng boost abseil ninja gtk+3
|
||||||
|
|
||||||
# Set up vcpkg for Windows builds
|
# Set up vcpkg for Windows builds (Abseil removed from vcpkg.json to avoid MSYS2 issues)
|
||||||
- name: Set up vcpkg (Windows)
|
- name: Set up vcpkg (Windows)
|
||||||
if: runner.os == 'Windows'
|
if: runner.os == 'Windows'
|
||||||
uses: lukka/run-vcpkg@v11
|
uses: lukka/run-vcpkg@v11
|
||||||
@@ -209,15 +209,15 @@ jobs:
|
|||||||
shell: pwsh
|
shell: pwsh
|
||||||
run: |
|
run: |
|
||||||
Write-Host "Configuring CMake for Windows build..."
|
Write-Host "Configuring CMake for Windows build..."
|
||||||
|
Write-Host "Note: Using source-built Abseil, vcpkg for other dependencies"
|
||||||
|
|
||||||
# Use vcpkg toolchain
|
# Use vcpkg toolchain (Abseil will be built from source via cmake/absl.cmake)
|
||||||
cmake -B build `
|
cmake -B build `
|
||||||
-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} `
|
-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} `
|
||||||
-DCMAKE_POLICY_VERSION_MINIMUM=3.16 `
|
-DCMAKE_POLICY_VERSION_MINIMUM=3.16 `
|
||||||
-DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" `
|
-DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" `
|
||||||
-DYAZE_BUILD_TESTS=OFF `
|
-DYAZE_BUILD_TESTS=OFF `
|
||||||
-DYAZE_BUILD_EMU=OFF `
|
-DYAZE_BUILD_EMU=OFF `
|
||||||
-DYAZE_BUILD_Z3ED=OFF `
|
|
||||||
-DYAZE_ENABLE_ROM_TESTS=OFF `
|
-DYAZE_ENABLE_ROM_TESTS=OFF `
|
||||||
-DYAZE_ENABLE_EXPERIMENTAL_TESTS=OFF `
|
-DYAZE_ENABLE_EXPERIMENTAL_TESTS=OFF `
|
||||||
-DYAZE_INSTALL_LIB=OFF `
|
-DYAZE_INSTALL_LIB=OFF `
|
||||||
|
|||||||
@@ -22,14 +22,16 @@ endif()
|
|||||||
|
|
||||||
# libpng and ZLIB dependencies
|
# libpng and ZLIB dependencies
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
# Windows builds with vcpkg
|
# Windows builds with vcpkg (Abseil removed to avoid MSYS2 issues)
|
||||||
if(NOT YAZE_MINIMAL_BUILD)
|
if(NOT YAZE_MINIMAL_BUILD)
|
||||||
find_package(ZLIB REQUIRED)
|
find_package(ZLIB REQUIRED)
|
||||||
find_package(PNG REQUIRED)
|
find_package(PNG REQUIRED)
|
||||||
|
find_package(GLEW REQUIRED)
|
||||||
else()
|
else()
|
||||||
# For CI/minimal builds, try to find but don't require
|
# For CI/minimal builds, try to find but don't require
|
||||||
find_package(ZLIB QUIET)
|
find_package(ZLIB QUIET)
|
||||||
find_package(PNG QUIET)
|
find_package(PNG QUIET)
|
||||||
|
find_package(GLEW QUIET)
|
||||||
if(NOT ZLIB_FOUND OR NOT PNG_FOUND)
|
if(NOT ZLIB_FOUND OR NOT PNG_FOUND)
|
||||||
message(STATUS "PNG/ZLIB not found in minimal build, some features may be disabled")
|
message(STATUS "PNG/ZLIB not found in minimal build, some features may be disabled")
|
||||||
set(PNG_FOUND FALSE)
|
set(PNG_FOUND FALSE)
|
||||||
|
|||||||
11
vcpkg.json
11
vcpkg.json
@@ -16,22 +16,13 @@
|
|||||||
"platform": "!uwp",
|
"platform": "!uwp",
|
||||||
"features": ["vulkan"]
|
"features": ["vulkan"]
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "abseil",
|
|
||||||
"platform": "!uwp"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "glew",
|
"name": "glew",
|
||||||
"platform": "!uwp"
|
"platform": "!uwp"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"builtin-baseline": "c8696863d371ab7f46e213d8f5ca923c4aef2a00",
|
"builtin-baseline": "c8696863d371ab7f46e213d8f5ca923c4aef2a00",
|
||||||
"overrides": [
|
"overrides": [],
|
||||||
{
|
|
||||||
"name": "abseil",
|
|
||||||
"version": "20220623.1"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"features": {
|
"features": {
|
||||||
"pkg-config": {
|
"pkg-config": {
|
||||||
"description": "Use pkg-config for dependency detection",
|
"description": "Use pkg-config for dependency detection",
|
||||||
|
|||||||
Reference in New Issue
Block a user