mirror of
https://github.com/microsoft/DirectXTex
synced 2024-11-21 20:10:05 +00:00
CMake updated to use vcpkg for arm64 version of dxmath
This commit is contained in:
parent
2a1a884507
commit
0fdfee8ad6
@ -139,7 +139,8 @@ if(MSVC)
|
||||
string(REPLACE "/GR " "/GR- " CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
|
||||
endif()
|
||||
|
||||
if (NOT WIN32)
|
||||
if ((NOT WIN32) OR VCPKG_TOOLCHAIN)
|
||||
message("INFO: Using VCPKG for DirectX-Headers and DirectXMath.")
|
||||
find_package(directx-headers CONFIG REQUIRED)
|
||||
find_package(directxmath CONFIG REQUIRED)
|
||||
target_link_libraries(${PROJECT_NAME} PRIVATE Microsoft::DirectX-Headers Microsoft::DirectXMath)
|
||||
@ -206,6 +207,12 @@ if(BUILD_TOOLS AND WIN32 AND (NOT WINDOWS_STORE))
|
||||
target_compile_options(texconv PRIVATE -DUSE_OPENEXR)
|
||||
target_compile_options(texdiag PRIVATE -DUSE_OPENEXR)
|
||||
endif()
|
||||
|
||||
if (VCPKG_TOOLCHAIN)
|
||||
target_link_libraries(texassemble Microsoft::DirectX-Headers Microsoft::DirectXMath)
|
||||
target_link_libraries(texconv Microsoft::DirectX-Headers Microsoft::DirectXMath)
|
||||
target_link_libraries(texdiag Microsoft::DirectX-Headers Microsoft::DirectXMath)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(MSVC)
|
||||
|
@ -70,7 +70,21 @@
|
||||
"buildCommandArgs": "-v",
|
||||
"ctestCommandArgs": "",
|
||||
"inheritEnvironments": [ "msvc_arm64_x64" ],
|
||||
"variables": []
|
||||
"variables": [],
|
||||
"cmakeToolchain": "D:\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake"
|
||||
},
|
||||
{
|
||||
"name": "arm64-Clang-Debug",
|
||||
"generator": "Ninja",
|
||||
"configurationType": "Debug",
|
||||
"buildRoot": "${projectDir}\\out\\build\\${name}",
|
||||
"installRoot": "${projectDir}\\out\\install\\${name}",
|
||||
"cmakeCommandArgs": "",
|
||||
"buildCommandArgs": "-v",
|
||||
"ctestCommandArgs": "",
|
||||
"inheritEnvironments": [ "clang_cl_arm64_x64" ],
|
||||
"variables": [],
|
||||
"cmakeToolchain": "D:\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake"
|
||||
}
|
||||
]
|
||||
}
|
Loading…
Reference in New Issue
Block a user