From e32fd2a401c6fabb5118a105d1b11cd9c340357a Mon Sep 17 00:00:00 2001 From: "r.nowak" Date: Fri, 14 Nov 2025 10:03:26 +0100 Subject: [PATCH 1/3] use CMAKE_GENERATOR_PLATFORM if CMAKE_SYSTEM_NAME is WindowsStore --- cmake/DetectTargetPlatform.cmake | 13 ++++++------- cmake/FindVcvarsall.cmake | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cmake/DetectTargetPlatform.cmake b/cmake/DetectTargetPlatform.cmake index ad5dd96..96f8b4f 100644 --- a/cmake/DetectTargetPlatform.cmake +++ b/cmake/DetectTargetPlatform.cmake @@ -6,18 +6,17 @@ function(detect_target_platform TARGET) endif() if(MSVC) - if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86") + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86" OR CMAKE_GENERATOR_PLATFORM STREQUAL "Win32") set(${TARGET} VC-WIN32) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" OR CMAKE_GENERATOR_PLATFORM STREQUAL "x64") set(${TARGET} VC-WIN64A) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM") + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM" OR CMAKE_GENERATOR_PLATFORM STREQUAL "ARM") set(${TARGET} VC-WIN32-ARM) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64") + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64" OR CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64") set(${TARGET} VC-WIN64-ARM) endif() - - if(WINDOWS_STORE) - string(APPEND ${TARGET} -UWP) + if("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") + set(${TARGET} "${${TARGET}}-UWP") endif() elseif(MINGW) set(${TARGET} mingw${PREFIX}) diff --git a/cmake/FindVcvarsall.cmake b/cmake/FindVcvarsall.cmake index 249aedf..908599f 100644 --- a/cmake/FindVcvarsall.cmake +++ b/cmake/FindVcvarsall.cmake @@ -51,7 +51,7 @@ function(set_vcvarsall_command COMMAND) endif() endif() - if(WINDOWS_STORE) + if("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") set(VCVARSALL_PLATFORM_TYPE uwp) endif() From 5a54142009d1a9c8f23e842d8f0c6c3ac02c38d0 Mon Sep 17 00:00:00 2001 From: "r.nowak" Date: Fri, 14 Nov 2025 17:16:19 +0100 Subject: [PATCH 2/3] use simpler and cleaner WINDOWS_STORE to check uwp builds --- cmake/DetectTargetPlatform.cmake | 2 +- cmake/FindVcvarsall.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/DetectTargetPlatform.cmake b/cmake/DetectTargetPlatform.cmake index 96f8b4f..24b0751 100644 --- a/cmake/DetectTargetPlatform.cmake +++ b/cmake/DetectTargetPlatform.cmake @@ -15,7 +15,7 @@ function(detect_target_platform TARGET) elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64" OR CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64") set(${TARGET} VC-WIN64-ARM) endif() - if("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") + if(WINDOWS_STORE) set(${TARGET} "${${TARGET}}-UWP") endif() elseif(MINGW) diff --git a/cmake/FindVcvarsall.cmake b/cmake/FindVcvarsall.cmake index 908599f..249aedf 100644 --- a/cmake/FindVcvarsall.cmake +++ b/cmake/FindVcvarsall.cmake @@ -51,7 +51,7 @@ function(set_vcvarsall_command COMMAND) endif() endif() - if("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") + if(WINDOWS_STORE) set(VCVARSALL_PLATFORM_TYPE uwp) endif() From fe4b54b59a666d2cae651dff3fc7debcaa455268 Mon Sep 17 00:00:00 2001 From: "r.nowak" Date: Mon, 17 Nov 2025 18:42:47 +0100 Subject: [PATCH 3/3] revert back to string(APPEND --- cmake/DetectTargetPlatform.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/DetectTargetPlatform.cmake b/cmake/DetectTargetPlatform.cmake index 24b0751..7dc3046 100644 --- a/cmake/DetectTargetPlatform.cmake +++ b/cmake/DetectTargetPlatform.cmake @@ -16,7 +16,7 @@ function(detect_target_platform TARGET) set(${TARGET} VC-WIN64-ARM) endif() if(WINDOWS_STORE) - set(${TARGET} "${${TARGET}}-UWP") + string(APPEND ${TARGET} -UWP) endif() elseif(MINGW) set(${TARGET} mingw${PREFIX})