diff options
| author | Rémy Tassoux <contact@rt2.fr> | 2020-10-13 22:29:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-13 13:29:51 -0700 |
| commit | 83f88c7a629a8c681fa0f68c207377a9146dd7e5 (patch) | |
| tree | 12d51a5848226f7d1d0ff7905c80359934b62548 | |
| parent | 15ec0792d87e5332285aa8178d3c5ff17422c7f7 (diff) | |
| download | vcpkg-83f88c7a629a8c681fa0f68c207377a9146dd7e5.tar.gz vcpkg-83f88c7a629a8c681fa0f68c207377a9146dd7e5.zip | |
[directxtk12] Use CMake build system (#13975)
* [directxtk12] Use CMake build system
Use the provided CMake file instead of the VS solutions to build the library, as recommended in the maintainer guidelines.
* [directxtk12] Fix wrong port version
* [directxtk12] Use ninja
| -rw-r--r-- | ports/directxtk12/CONTROL | 1 | ||||
| -rw-r--r-- | ports/directxtk12/portfile.cmake | 47 |
2 files changed, 11 insertions, 37 deletions
diff --git a/ports/directxtk12/CONTROL b/ports/directxtk12/CONTROL index 795111628..c5c30e5f0 100644 --- a/ports/directxtk12/CONTROL +++ b/ports/directxtk12/CONTROL @@ -1,4 +1,5 @@ Source: directxtk12 Version: sept2020 +Port-Version: 1 Homepage: https://walbourn.github.io/directx-tool-kit-for-directx-12 Description: A collection of helper classes for writing DirectX 12 code in C++. diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index 7310ee0a2..01efa2aa3 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -8,46 +8,19 @@ vcpkg_from_github( HEAD_REF master ) -IF (TRIPLET_SYSTEM_ARCH MATCHES "x86") - SET(BUILD_ARCH "Win32") -ELSE() - SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH}) -ENDIF() - -if (VCPKG_PLATFORM_TOOLSET STREQUAL "v140") - set(VS_VERSION "2015") -elseif (VCPKG_PLATFORM_TOOLSET STREQUAL "v141") - set(VS_VERSION "2017") -elseif (VCPKG_PLATFORM_TOOLSET STREQUAL "v142") - set(VS_VERSION "2019") -else() - message(FATAL_ERROR "Unsupported platform toolset.") -endif() - -if(VCPKG_TARGET_IS_UWP) - set(SLN_NAME "Windows10_${VS_VERSION}") -else() - set(SLN_NAME "Desktop_${VS_VERSION}_Win10") -endif() - -vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/DirectXTK_${SLN_NAME}.sln - PLATFORM ${TRIPLET_SYSTEM_ARCH} +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DBUILD_XAUDIO_WIN10=ON ) -file(INSTALL - ${SOURCE_PATH}/Inc/ - DESTINATION ${CURRENT_PACKAGES_DIR}/include/DirectXTK12 -) +vcpkg_build_cmake() -file(INSTALL - ${SOURCE_PATH}/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/DirectXTK12.lib - ${SOURCE_PATH}/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/DirectXTK12.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +file(INSTALL ${SOURCE_PATH}/Inc/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/DirectXTK12) -file(INSTALL - ${SOURCE_PATH}/Bin/${SLN_NAME}/${BUILD_ARCH}/Debug/DirectXTK12.lib - ${SOURCE_PATH}/Bin/${SLN_NAME}/${BUILD_ARCH}/Debug/DirectXTK12.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +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(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |