AuroraMiddleware/DirectXTex
1
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex synced 2024-11-24 21:30:14 +00:00
Code Issues Releases Wiki Activity

CMake updated to use vcpkg for arm64 version of dxmath

Browse Source
This commit is contained in:
Chuck Walbourn 2021-02-03 23:21:08 -08:00
parent 2a1a884507
commit 0fdfee8ad6
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -139,7 +139,8 @@ if(MSVC)
string(REPLACE "/GR " "/GR- " CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) string(REPLACE "/GR " "/GR- " CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
endif() 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(directx-headers CONFIG REQUIRED)
find_package(directxmath CONFIG REQUIRED) find_package(directxmath CONFIG REQUIRED)
target_link_libraries(${PROJECT_NAME} PRIVATE Microsoft::DirectX-Headers Microsoft::DirectXMath) 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(texconv PRIVATE -DUSE_OPENEXR)
target_compile_options(texdiag PRIVATE -DUSE_OPENEXR) target_compile_options(texdiag PRIVATE -DUSE_OPENEXR)
endif() 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() endif()
if(MSVC) if(MSVC)

16
CMakeSettings.json
View File

@ -70,7 +70,21 @@
"buildCommandArgs": "-v", "buildCommandArgs": "-v",
"ctestCommandArgs": "", "ctestCommandArgs": "",
"inheritEnvironments": [ "msvc_arm64_x64" ], "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"
} }
] ]
} }