issue #685
This commit is contained in:
tildearrow 2022-12-28 16:23:47 -05:00
parent dc868539ec
commit 905bb8bf44
2 changed files with 8 additions and 8 deletions

View File

@ -19,14 +19,14 @@ jobs:
matrix:
config:
- { name: 'Windows MSVC x86', os: windows-latest, compiler: msvc, arch: x86 }
- { name: 'Windows MSVC x86_64', os: windows-latest, compiler: msvc, arch: x86_64 }
- { name: 'Windows MinGW x86', os: ubuntu-20.04, compiler: mingw, arch: x86 }
- { name: 'Windows MinGW x86_64', os: ubuntu-20.04, compiler: mingw, arch: x86_64 }
- { name: 'macOS x86_64', os: macos-latest, arch: x86_64 }
- { name: 'macOS ARM', os: macos-latest, arch: arm64 }
- { name: 'Linux x86_64', os: ubuntu-18.04, arch: x86_64 }
# - { name: 'Windows MSVC x86_64', os: windows-latest, compiler: msvc, arch: x86_64 }
# - { name: 'Windows MinGW x86', os: ubuntu-20.04, compiler: mingw, arch: x86 }
# - { name: 'Windows MinGW x86_64', os: ubuntu-20.04, compiler: mingw, arch: x86_64 }
# - { name: 'macOS x86_64', os: macos-latest, arch: x86_64 }
# - { name: 'macOS ARM', os: macos-latest, arch: arm64 }
# - { name: 'Linux x86_64', os: ubuntu-18.04, arch: x86_64 }
#- { name: 'Linux ARM', os: ubuntu-18.04, arch: armhf }
fail-fast: false
fail-fast: true
name: ${{ matrix.config.name }}
runs-on: ${{ matrix.config.os }}

View File

@ -708,7 +708,7 @@ if (WIN32)
endif()
# support Windows XP
if (CMAKE_SIZEOF_VOID_P EQUAL 4)
list(APPEND DEPENDENCIES_DEFINES "_WIN32_WINNT=0x0501")
list(APPEND DEPENDENCIES_DEFINES "_WIN32_WINNT=0x0501" "PSAPI_VERSION=1")
endif()
elseif (APPLE)
find_library(COCOA Cocoa REQUIRED)