Remove vcpkg because that garbage thing keeps failing builds...
This commit is contained in:
parent
bddf1a2548
commit
d8c0e4284f
3 changed files with 1 additions and 44 deletions
9
.github/workflows/continuous_integration.yml
vendored
9
.github/workflows/continuous_integration.yml
vendored
|
|
@ -12,12 +12,10 @@ jobs:
|
|||
config:
|
||||
- name: Visual Studio 2022
|
||||
os: windows-2022
|
||||
extra_options: -DCMAKE_TOOLCHAIN_FILE=build/vcpkg/scripts/buildsystems/vcpkg.cmake
|
||||
build_type: RelWithDebInfo
|
||||
|
||||
- name: Visual Studio 2022
|
||||
os: windows-2022
|
||||
extra_options: -DCMAKE_TOOLCHAIN_FILE=build/vcpkg/scripts/buildsystems/vcpkg.cmake
|
||||
build_type: Debug
|
||||
|
||||
- name: macOS
|
||||
|
|
@ -76,13 +74,6 @@ jobs:
|
|||
tar -xf "${ZMUSIC_PACKAGE}"
|
||||
fi
|
||||
|
||||
- name: Setup vcpkg
|
||||
uses: lukka/run-vcpkg@v11
|
||||
if: runner.os == 'Windows'
|
||||
with:
|
||||
vcpkgDirectory: '${{ github.workspace }}/build/vcpkg'
|
||||
vcpkgGitCommitId: '2c401863dd54a640aeb26ed736c55489c079323b'
|
||||
|
||||
- name: Configure
|
||||
shell: bash
|
||||
run: |
|
||||
|
|
|
|||
|
|
@ -16,33 +16,8 @@ if( COMMAND cmake_policy )
|
|||
endif()
|
||||
endif()
|
||||
|
||||
if (LIBVPX_VCPKG)
|
||||
list(APPEND VCPKG_MANIFEST_FEATURES "vcpkg-libvpx")
|
||||
endif()
|
||||
|
||||
if (OPENAL_SOFT_VCPKG)
|
||||
list(APPEND VCPKG_MANIFEST_FEATURES "vcpkg-openal-soft")
|
||||
endif()
|
||||
|
||||
if (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows"))
|
||||
# Force static triplet on Windows
|
||||
set(VCPKG_TARGET_TRIPLET "x64-windows-static")
|
||||
endif()
|
||||
|
||||
project(VkDoom)
|
||||
|
||||
if (WIN32 AND VCPKG_TOOLCHAIN)
|
||||
option(LIBVPX_VCPKG "Use libvpx from vcpkg" OFF)
|
||||
endif()
|
||||
|
||||
if (VCPKG_TOOLCHAIN)
|
||||
option(OPENAL_SOFT_VCPKG "Use OpenAL from vcpkg" OFF)
|
||||
endif()
|
||||
|
||||
if (NOT VCPKG_TOOLCHAIN)
|
||||
set(VCPKG_MANIFEST_FEATURES)
|
||||
endif()
|
||||
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||
|
|
|
|||
|
|
@ -139,11 +139,7 @@ else()
|
|||
endif()
|
||||
|
||||
if( NOT NO_OPENAL )
|
||||
if ( "vcpkg-openal-soft" IN_LIST VCPKG_MANIFEST_FEATURES )
|
||||
# Statically link to OpenAL from vcpkg
|
||||
find_package( OpenAL CONFIG REQUIRED )
|
||||
list( APPEND PROJECT_LIBRARIES OpenAL::OpenAL )
|
||||
elseif ( NOT DYN_OPENAL ) # DYN_OPENAL uses local copies of the headers.
|
||||
if ( NOT DYN_OPENAL ) # DYN_OPENAL uses local copies of the headers.
|
||||
find_package( OpenAL )
|
||||
mark_as_advanced(CLEAR OPENAL_INCLUDE_DIR)
|
||||
if( OPENAL_INCLUDE_DIR )
|
||||
|
|
@ -1418,11 +1414,6 @@ add_custom_command(TARGET zdoom POST_BUILD
|
|||
${CMAKE_SOURCE_DIR}/fm_banks/gs-by-papiezak-and-sneakernets.wopn $<TARGET_FILE_DIR:zdoom>/fm_banks/gs-by-papiezak-and-sneakernets.wopn
|
||||
)
|
||||
|
||||
if (VCPKG_TOOLCHAIN)
|
||||
x_vcpkg_install_local_dependencies(TARGETS zdoom DESTINATION ".")
|
||||
x_vcpkg_install_local_dependencies(TARGETS ztool DESTINATION ".")
|
||||
endif()
|
||||
|
||||
if( WIN32 )
|
||||
set( INSTALL_SOUNDFONT_PATH . CACHE STRING "Directory where soundfonts and WOPL/WOPN banks will be placed during install." )
|
||||
else()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue