1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix path generation for arm devices

Browse Source 
Only x86 and x64 devices have 'x' at the beginning

Task-number: QTBUG-124800
Change-Id: Ia4586fdd8497fa8edb5f26a2e53305fbe2a57d45
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Morteza Jamshidi 2024-11-07 16:07:14 +01:00
parent 6ac399b8f0
commit 22c0cf80c8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/QtPublicWindowsHelpers.cmake
View File

@ -14,9 +14,9 @@ function(qt6_add_win_app_sdk target)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm*") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
set(win_app_sdk_arch "arm") set(win_app_sdk_arch "arm")
elseif(CMAKE_SIZEOF_VOID_P EQUAL 8) elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(win_app_sdk_arch "64") set(win_app_sdk_arch "x64")
elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
set(win_app_sdk_arch "86") set(win_app_sdk_arch "x86")
endif() endif()
if(WIN_APP_SDK_ROOT) if(WIN_APP_SDK_ROOT)
@ -61,13 +61,13 @@ function(qt6_add_win_app_sdk target)
NAMES Microsoft.WindowsAppRuntime NAMES Microsoft.WindowsAppRuntime
HINTS ${WINAPPSDK_LIBRARY_DIR} "${win_app_sdk_root}" HINTS ${WINAPPSDK_LIBRARY_DIR} "${win_app_sdk_root}"
"${win_app_sdk_root}/lib" "${win_app_sdk_root}/lib"
"${win_app_sdk_root}/lib/win10-x${win_app_sdk_arch}") "${win_app_sdk_root}/lib/win10-${win_app_sdk_arch}")
find_library(WINAPPSDK_BOOTSTRAP_LIBRARY find_library(WINAPPSDK_BOOTSTRAP_LIBRARY
NAMES Microsoft.WindowsAppRuntime.Bootstrap NAMES Microsoft.WindowsAppRuntime.Bootstrap
HINTS ${WINAPPSDK_LIBRARY_DIR} "${win_app_sdk_root}" HINTS ${WINAPPSDK_LIBRARY_DIR} "${win_app_sdk_root}"
"${win_app_sdk_root}/lib" "${win_app_sdk_root}/lib"
"${win_app_sdk_root}/lib/win10-x${win_app_sdk_arch}") "${win_app_sdk_root}/lib/win10-${win_app_sdk_arch}")
if(WINAPPSDK_INCLUDE_DIR AND WINAPPSDK_LIBRARY AND WINAPPSDK_BOOTSTRAP_LIBRARY) if(WINAPPSDK_INCLUDE_DIR AND WINAPPSDK_LIBRARY AND WINAPPSDK_BOOTSTRAP_LIBRARY)
execute_process(COMMAND execute_process(COMMAND
@ -93,7 +93,7 @@ function(qt6_add_win_app_sdk target)
target_include_directories(${target} target_include_directories(${target}
PRIVATE "${generated_headers_path}") PRIVATE "${generated_headers_path}")
target_link_directories(${target} target_link_directories(${target}
PRIVATE "${win_app_sdk_root}/lib/win10-x${win_app_sdk_arch}") PRIVATE "${win_app_sdk_root}/lib/win10-${win_app_sdk_arch}")
target_link_libraries(${target} target_link_libraries(${target}
PRIVATE Microsoft.WindowsAppRuntime.lib Microsoft.WindowsAppRuntime.Bootstrap.lib) PRIVATE Microsoft.WindowsAppRuntime.lib Microsoft.WindowsAppRuntime.Bootstrap.lib)
endfunction() endfunction()