mirror of https://github.com/microsoft/vcpkg.git
[xaudio2redist, directxtk] updated XAudio2 port to 1.2.8 and added cmake find (#20780)
* [xaudio2redist] updated for new version and added find_package support * 1.2.7 didn't last long... on to 1.2.8 * baseline update * Upstream change for directxtk port to use new find package * update baseline * Updated vcpkg_fail_port_install for Linux and OSX * Update ports/xaudio2redist/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * update baseline * Added quotes per request * Update baseline Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
This commit is contained in:
Chuck Walbourn
GitHub
parent
40b6acf770
commit
b430ff7ec3
|
|
@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX" "Linux")
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Microsoft/DirectXTK
|
||||
REF oct2021
|
||||
SHA512 5203ca6fe479359615e9d775d3e378669d1fbbb828915ed6b475d58e85f597cbbdbe23425e3c77df33291a806a3865131e7c1d1001ec92f16747958f3cf251bf
|
||||
REF oct2021b
|
||||
SHA512 203e930a9d7fb8dbf3a9e9266f00ee847ceaecb462a3c0450fac54fa2e36fda206d35ab7a1eac59eb83dd433f64e4c353a38dfa40691cd7326ba76b052931bf2
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "directxtk",
|
||||
"version-string": "oct2021",
|
||||
"version-string": "oct2021b",
|
||||
"description": "A collection of helper classes for writing DirectX 11.x code in C++.",
|
||||
"homepage": "https://github.com/Microsoft/DirectXTK",
|
||||
"documentation": "https://github.com/microsoft/DirectXTK/wiki",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,54 @@
|
|||
include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
|
||||
|
||||
set(XAUDIO2REDIST_VERSION "1.2.8")
|
||||
|
||||
if(NOT xaudio2redist_INCLUDE_DIR)
|
||||
find_path(xaudio2redist_INCLUDE_DIR
|
||||
NAMES xaudio2redist.h
|
||||
PATH_SUFFIXES xaudio2redist)
|
||||
endif()
|
||||
|
||||
find_package_handle_standard_args(xaudio2redist
|
||||
REQUIRED_VARS xaudio2redist_INCLUDE_DIR
|
||||
VERSION_VAR XAUDIO2REDIST_VERSION)
|
||||
mark_as_advanced(xaudio2redist_INCLUDE_DIR)
|
||||
|
||||
string(REPLACE "/include/xaudio2redist" "/lib" xaudio2redist_LIB_DIR ${xaudio2redist_INCLUDE_DIR})
|
||||
string(REPLACE "/include/xaudio2redist" "/bin" xaudio2redist_BIN_DIR ${xaudio2redist_INCLUDE_DIR})
|
||||
string(REPLACE "/include/xaudio2redist" "/debug/lib" xaudio2redist_DEBUG_LIB_DIR ${xaudio2redist_INCLUDE_DIR})
|
||||
string(REPLACE "/include/xaudio2redist" "/debug/bin" xaudio2redist_DEBUG_BIN_DIR ${xaudio2redist_INCLUDE_DIR})
|
||||
|
||||
if(XAUDIO2REDIST_FOUND AND NOT TARGET Microsoft::XAudio2Redist)
|
||||
set(XAUDIO2_RELEASE_LIB "${xaudio2redist_LIB_DIR}/xaudio2_9redist.lib")
|
||||
set(XAUDIO2_RELEASE_DLL "${xaudio2redist_BIN_DIR}/xaudio2_9redist.dll")
|
||||
|
||||
set(XAUDIO2_DEBUG_LIB "${xaudio2redist_DEBUG_LIB_DIR}/xaudio2_9redist.lib")
|
||||
set(XAUDIO2_DEBUG_DLL "${xaudio2redist_DEBUG_BIN_DIR}/xaudio2_9redist.dll")
|
||||
|
||||
add_library(Microsoft::XAudio2Redist SHARED IMPORTED)
|
||||
set_target_properties(Microsoft::XAudio2Redist PROPERTIES
|
||||
IMPORTED_LOCATION_RELEASE "${XAUDIO2_RELEASE_DLL}"
|
||||
IMPORTED_IMPLIB_RELEASE "${XAUDIO2_RELEASE_LIB}"
|
||||
IMPORTED_LOCATION_DEBUG "${XAUDIO2_DEBUG_DLL}"
|
||||
IMPORTED_IMPLIB_DEBUG "${XAUDIO2_DEBUG_LIB}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${xaudio2redist_INCLUDE_DIR}"
|
||||
IMPORTED_CONFIGURATIONS "Debug;Release"
|
||||
IMPORTED_LINK_INTERFACE_LANGUAGES "C")
|
||||
endif()
|
||||
|
||||
if(XAUDIO2REDIST_FOUND AND NOT TARGET Microsoft::XApoBase)
|
||||
set(XAPOBASE_RELEASE_LIB "${xaudio2redist_LIB_DIR}/xapobaseredist_md.lib")
|
||||
set(XAPOBASE_DEBUG_LIB "${xaudio2redist_DEBUG_LIB_DIR}/xapobaseredist_md.lib")
|
||||
|
||||
if(NOT EXISTS ${XAPOBASE_RELEASE_LIB})
|
||||
set(XAPOBASE_RELEASE_LIB "${xaudio2redist_LIB_DIR}/xapobaseredist.lib")
|
||||
set(XAPOBASE_DEBUG_LIB "${xaudio2redist_DEBUG_LIB_DIR}/xapobaseredist.lib")
|
||||
endif()
|
||||
|
||||
add_library(Microsoft::XApoBase STATIC IMPORTED)
|
||||
set_target_properties(Microsoft::XApoBase PROPERTIES
|
||||
IMPORTED_LOCATION_RELEASE "${XAPOBASE_RELEASE_LIB}"
|
||||
IMPORTED_LOCATION_DEBUG "${XAPOBASE_DEBUG_LIB}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${xaudio2redist_INCLUDE_DIR}"
|
||||
IMPORTED_CONFIGURATIONS "Debug;Release")
|
||||
endif()
|
||||
|
|
@ -1,15 +1,11 @@
|
|||
vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP")
|
||||
|
||||
if(NOT VCPKG_TARGET_IS_WINDOWS)
|
||||
message(FATAL_ERROR "${PORT} only supports Windows.")
|
||||
endif()
|
||||
vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP" "Linux" "OSX")
|
||||
|
||||
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
|
||||
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://www.nuget.org/api/v2/package/Microsoft.XAudio2.Redist/1.2.6"
|
||||
FILENAME "xaudio2redist.1.2.6.zip"
|
||||
SHA512 f9b0bacb5787e0239cbf1ffed8e1e8896aa32f69755b084995b2fd1bfe4d49a876d9a69e26469e8779a461e8ff74dc9d5ea86e1ff045dfe2770dfb08b8ba16c3
|
||||
URLS "https://www.nuget.org/api/v2/package/Microsoft.XAudio2.Redist/1.2.8"
|
||||
FILENAME "xaudio2redist.1.2.8.zip"
|
||||
SHA512 509b2783457b86ed1878fd4e14a01fa7288591925a2bb3cad4d68afd597fbff1f1349b619dad628b5d685169825a775120e1611559e9097837cff0fb6d39acf0
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
|
|
@ -18,18 +14,24 @@ vcpkg_extract_source_archive_ex(
|
|||
NO_REMOVE_ONE_LEVEL
|
||||
)
|
||||
|
||||
file(GLOB HEADER_FILES ${PACKAGE_PATH}/build/native/include/*.h)
|
||||
file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})
|
||||
file(GLOB HEADER_FILES "${PACKAGE_PATH}/build/native/include/*.h")
|
||||
file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
|
||||
|
||||
file(COPY ${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
|
||||
file(COPY ${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
|
||||
file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
|
||||
file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
|
||||
|
||||
file(COPY ${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
|
||||
file(COPY ${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
|
||||
file(COPY ${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist_md.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
|
||||
file(COPY ${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist_md.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
|
||||
if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
|
||||
file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist_md.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
|
||||
file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist_md.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
|
||||
else()
|
||||
file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
|
||||
file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
|
||||
endif()
|
||||
|
||||
file(COPY ${PACKAGE_PATH}/build/native/release/bin/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin/)
|
||||
file(COPY ${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/)
|
||||
file(COPY "${PACKAGE_PATH}/build/native/release/bin/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
|
||||
file(COPY "${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||
|
||||
file(INSTALL ${PACKAGE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
file(INSTALL "${PACKAGE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
||||
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/Findxaudio2redist.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
message(STATUS "Using VCPKG Findxaudio2redist")
|
||||
set(XAUDIO2_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
|
||||
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
|
||||
|
||||
list(REMOVE_ITEM ARGS "NO_MODULE")
|
||||
list(REMOVE_ITEM ARGS "CONFIG")
|
||||
list(REMOVE_ITEM ARGS "MODULE")
|
||||
|
||||
_find_package(${ARGS})
|
||||
|
||||
set(CMAKE_MODULE_PATH ${XAUDIO2_PREV_MODULE_PATH})
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "xaudio2redist",
|
||||
"version-string": "1.2.6",
|
||||
"version-string": "1.2.8",
|
||||
"description": "Redistributable version of XAudio 2.9 for Windows 7 SP1 or later",
|
||||
"homepage": "https://aka.ms/XAudio2Redist",
|
||||
"supports": "windows & !arm & !uwp & !static"
|
||||
|
|
|
|||
|
|
@ -1817,7 +1817,7 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"directxtk": {
|
||||
"baseline": "oct2021",
|
||||
"baseline": "oct2021b",
|
||||
"port-version": 0
|
||||
},
|
||||
"directxtk12": {
|
||||
|
|
@ -7145,7 +7145,7 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"xaudio2redist": {
|
||||
"baseline": "1.2.6",
|
||||
"baseline": "1.2.8",
|
||||
"port-version": 0
|
||||
},
|
||||
"xbyak": {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "09200c3486444bbcce57ec680606781b5e16175c",
|
||||
"version-string": "oct2021b",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "e6356a5599a11c8670068358b150033e9da82b55",
|
||||
"version-string": "oct2021",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "71315ed933daddc996ecb863c39fc178b3f80771",
|
||||
"version-string": "1.2.8",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "e33a929ddbf8ebc95959d6650a38d351aafea07c",
|
||||
"version-string": "1.2.6",
|
||||
|
|
|
|||
Loading…
Reference in New Issue