diff options
| author | Chuck Walbourn <walbourn@users.noreply.github.com> | 2020-12-28 17:28:53 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-28 17:28:53 -0800 |
| commit | ec58d649c18a56507468e47ea69c51a917d18052 (patch) | |
| tree | afeda4e54d6eaf86b1d786ccef9ff8d8516cf016 /ports/directxtk12 | |
| parent | d1e64a013e4df05b11fa1bb084abf1a3e3dde4ed (diff) | |
| download | vcpkg-ec58d649c18a56507468e47ea69c51a917d18052.tar.gz vcpkg-ec58d649c18a56507468e47ea69c51a917d18052.zip | |
Updated directxtk et al for cmake package support (#15210)
Diffstat (limited to 'ports/directxtk12')
| -rw-r--r-- | ports/directxtk12/CONTROL | 4 | ||||
| -rw-r--r-- | ports/directxtk12/portfile.cmake | 37 |
2 files changed, 31 insertions, 10 deletions
diff --git a/ports/directxtk12/CONTROL b/ports/directxtk12/CONTROL index 4551b56c5..7f0a0842d 100644 --- a/ports/directxtk12/CONTROL +++ b/ports/directxtk12/CONTROL @@ -1,4 +1,6 @@ Source: directxtk12 -Version: nov2020 +Version: nov2020b Homepage: https://walbourn.github.io/directx-tool-kit-for-directx-12 Description: A collection of helper classes for writing DirectX 12 code in C++. +Supports: windows + diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index 825cdae2a..a02a284e3 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -1,10 +1,12 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 - REF nov2020 - SHA512 fd49bd8f124ac5c9808f8da09a955599234712b74525fd27739135f9044883b65f4c570048a9fe335f6aa82c8d49de1e6c0e81c904696ade3cd63b1982cf4d68 + REF nov2020b + SHA512 3a47209f109f993e4ca779bca9c9417c3f11a0472b3c91f52beb46a388edc5487d4e2cd472371ef6ffc4d3e54782d12e884befe8537fa68190c1556d6e36fbab HEAD_REF master ) @@ -14,13 +16,30 @@ vcpkg_configure_cmake( OPTIONS -DBUILD_XAUDIO_WIN10=ON ) -vcpkg_build_cmake() +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + +if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) + vcpkg_download_distfile(makespritefont + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/nov2020/MakeSpriteFont.exe" + FILENAME "makespritefont.exe" + SHA512 d576eecd9763d238e12ba8d865917738a4bc8cbf632943e5c11b9426ecdfeaa9e8522076f1bb7122d41e69158fc7ca0939f2d90f9986470639966b3f849d236a + ) + + vcpkg_download_distfile(xwbtool + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/nov2020/XWBTool.exe" + FILENAME "xwbtool.exe" + SHA512 6ac8fc12fcea0f808aac1367907dbbb0c5669c8c654fc21f38b4e1ce951710ade1851515dba074e9254579b018545c3cdb2b6cf57366dfba0196603510bf51cd + ) + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") -file(INSTALL ${SOURCE_PATH}/Inc/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/DirectXTK12) + file(INSTALL + ${DOWNLOADS}/makespritefont.exe + ${DOWNLOADS}/xwbtool.exe + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtk12/) +endif() -file(GLOB_RECURSE DEBUG_LIB ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/CMake/*.lib) -file(GLOB_RECURSE RELEASE_LIB ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake/*.lib) -file(INSTALL ${DEBUG_LIB} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -file(INSTALL ${RELEASE_LIB} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |