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/directxmesh | |
| parent | d1e64a013e4df05b11fa1bb084abf1a3e3dde4ed (diff) | |
| download | vcpkg-ec58d649c18a56507468e47ea69c51a917d18052.tar.gz vcpkg-ec58d649c18a56507468e47ea69c51a917d18052.zip | |
Updated directxtk et al for cmake package support (#15210)
Diffstat (limited to 'ports/directxmesh')
| -rw-r--r-- | ports/directxmesh/CONTROL | 4 | ||||
| -rw-r--r-- | ports/directxmesh/portfile.cmake | 50 |
2 files changed, 34 insertions, 20 deletions
diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL index 42c70287d..75008c7ef 100644 --- a/ports/directxmesh/CONTROL +++ b/ports/directxmesh/CONTROL @@ -1,8 +1,8 @@ Source: directxmesh -Version: nov2020 +Version: nov2020b Homepage: https://walbourn.github.io/directxmesh Description: DirectXMesh geometry processing library -Build-Depends: directxmesh[core,dx12](arm64|uwp) +Supports: windows Feature: dx12 Description: Build with DirectX12 support for Windows 10 diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index b9c3227b0..d4540454d 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -1,11 +1,14 @@ -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/DirectXMesh
- REF nov2020
- SHA512 07bf8acba1f15f1b74d864ac624c7e0bfbdf5927c3e66f94ef78ab447e757daa01351ca8e1c8e8652dbb7008cee13c30247922af2d1712e61bc50bdb55cedf42
+ REF nov2020b
+ SHA512 a3520d916324e16004ec0052c6d4c628be2ea62583d0169b663f67ce03ef84c3ba8ea01c239c75dc89a359de6748039dc11e405ba4b0c4f33ee0225e4e248415
HEAD_REF master
+ FILE_DISAMBIGUATOR 2
)
vcpkg_check_features(
@@ -14,30 +17,41 @@ vcpkg_check_features( dx12 BUILD_DX12
)
+if(VCPKG_TARGET_IS_UWP)
+ set(EXTRA_OPTIONS -DBUILD_TOOLS=OFF)
+else()
+ set(EXTRA_OPTIONS -DBUILD_TOOLS=ON)
+endif()
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
- OPTIONS ${FEATURE_OPTIONS}
+ OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS}
)
-if(NOT VCPKG_TARGET_IS_UWP AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
- vcpkg_build_cmake()
-else()
- vcpkg_build_cmake(TARGET DirectXMesh)
-endif()
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
-file(INSTALL ${SOURCE_PATH}/DirectXMesh/DirectXMesh.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(INSTALL ${SOURCE_PATH}/DirectXMesh/DirectXMesh.inl DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-
-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)
-if(NOT VCPKG_TARGET_IS_UWP AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+if(NOT VCPKG_TARGET_IS_UWP)
vcpkg_copy_tools(
- TOOL_NAMES Meshconvert
+ TOOL_NAMES meshconvert
SEARCH_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake
)
+
+elseif((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
+ vcpkg_download_distfile(meshconvert
+ URLS "https://github.com/Microsoft/DirectXMesh/releases/download/nov2020/meshconvert.exe"
+ FILENAME "meshconvert.exe"
+ SHA512 189552c74dc634f673a0d15851d7bb7c42c860023b1488086a9904323fc45207244c159c8848a211afafe258825f5051ee6fd85080da3f7f4afdf910764ca8ec
+ )
+
+ file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxmesh/")
+
+ file(INSTALL
+ ${DOWNLOADS}/meshconvert.exe
+ DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxmesh/)
endif()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|