Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-14 06:00:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix CMake issues with ARM

Browse Source
This commit is contained in:
Chuck Walbourn 2022-03-18 22:05:23 -07:00
parent df039e9236
commit ef39abc38d
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -38,6 +38,10 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/CMake")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/CMake") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/CMake")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/CMake") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/CMake")
if (DEFINED VCPKG_TARGET_ARCHITECTURE)
set(DIRECTX_ARCH ${VCPKG_TARGET_ARCHITECTURE})
endif()
#--- Library #--- Library
set(LIBRARY_HEADERS set(LIBRARY_HEADERS
DirectXTex/DirectXTex.h DirectXTex/DirectXTex.h
@ -241,7 +245,7 @@ if(MSVC)
target_compile_options(texdiag PRIVATE /fp:fast) target_compile_options(texdiag PRIVATE /fp:fast)
endif() endif()
if ((${CMAKE_SIZEOF_VOID_P} EQUAL "4") AND (NOT ${CMAKE_VS_PLATFORM_NAME} MATCHES "arm")) if((${CMAKE_SIZEOF_VOID_P} EQUAL 4) AND (NOT ${DIRECTX_ARCH} MATCHES "arm"))
target_compile_options(${PROJECT_NAME} PRIVATE /arch:SSE2) target_compile_options(${PROJECT_NAME} PRIVATE /arch:SSE2)
if(BUILD_TOOLS AND WIN32 AND (NOT WINDOWS_STORE)) if(BUILD_TOOLS AND WIN32 AND (NOT WINDOWS_STORE))
target_compile_options(texassemble PRIVATE /arch:SSE2) target_compile_options(texassemble PRIVATE /arch:SSE2)
@ -299,7 +303,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
endif() endif()
endif() endif()
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27) if ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27) AND (NOT (${DIRECTX_ARCH} MATCHES "arm(64)?")))
if(BUILD_TOOLS AND WIN32 AND (NOT WINDOWS_STORE)) if(BUILD_TOOLS AND WIN32 AND (NOT WINDOWS_STORE))
target_link_options(texassemble PRIVATE /CETCOMPAT) target_link_options(texassemble PRIVATE /CETCOMPAT)
target_link_options(texconv PRIVATE /CETCOMPAT) target_link_options(texconv PRIVATE /CETCOMPAT)

4
CMakePresets.json
View File

@ -17,6 +17,7 @@
"value": "x64", "value": "x64",
"strategy": "external" "strategy": "external"
}, },
"cacheVariables": { "DIRECTX_ARCH": "x64" },
"hidden": true "hidden": true
}, },
{ {
@ -25,6 +26,7 @@
"value": "x86", "value": "x86",
"strategy": "external" "strategy": "external"
}, },
"cacheVariables": { "DIRECTX_ARCH": "x86" },
"hidden": true "hidden": true
}, },
{ {
@ -33,6 +35,7 @@
"value": "arm", "value": "arm",
"strategy": "external" "strategy": "external"
}, },
"cacheVariables": { "DIRECTX_ARCH": "arm" },
"hidden": true "hidden": true
}, },
{ {
@ -41,6 +44,7 @@
"value": "arm64", "value": "arm64",
"strategy": "external" "strategy": "external"
}, },
"cacheVariables": { "DIRECTX_ARCH": "arm64" },
"hidden": true "hidden": true
}, },