From cd7e6308cdb29c3f40f32ac36351c75bdb6b159e Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Sun, 28 Jan 2024 13:59:36 +0100 Subject: [PATCH] CMake: Generalize determining platform name It is the same as CMAKE_VS_PLATFORM_NAME. Except for win32, which uses an empty name. --- build/cmake/init.cmake | 16 ++++------------ build/cmake/wxWidgetsConfig.cmake.in | 12 ++++-------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake index 7f572ee2b6..494a5938cc 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -133,20 +133,12 @@ wx_string_append(wxBUILD_FILE_ID "${lib_flavour}") set(wxPLATFORM_ARCH) if(CMAKE_GENERATOR_PLATFORM) - if (CMAKE_GENERATOR_PLATFORM STREQUAL "x64") - set(wxPLATFORM_ARCH "x64") - elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM") - set(wxPLATFORM_ARCH "arm") - elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64") - set(wxPLATFORM_ARCH "arm64") + if(NOT CMAKE_GENERATOR_PLATFORM STREQUAL "Win32") + string(TOLOWER ${CMAKE_GENERATOR_PLATFORM} wxPLATFORM_ARCH) endif() elseif(CMAKE_VS_PLATFORM_NAME) - if (CMAKE_VS_PLATFORM_NAME STREQUAL "x64") - set(wxPLATFORM_ARCH "x64") - elseif(CMAKE_VS_PLATFORM_NAME STREQUAL "ARM") - set(wxPLATFORM_ARCH "arm") - elseif(CMAKE_VS_PLATFORM_NAME STREQUAL "ARM64") - set(wxPLATFORM_ARCH "arm64") + if(NOT CMAKE_VS_PLATFORM_NAME STREQUAL "Win32") + string(TOLOWER ${CMAKE_VS_PLATFORM_NAME} wxPLATFORM_ARCH) endif() else() if(CMAKE_SIZEOF_VOID_P EQUAL 8) diff --git a/build/cmake/wxWidgetsConfig.cmake.in b/build/cmake/wxWidgetsConfig.cmake.in index 9983bc90dd..6726963238 100644 --- a/build/cmake/wxWidgetsConfig.cmake.in +++ b/build/cmake/wxWidgetsConfig.cmake.in @@ -12,16 +12,12 @@ if(WIN32 AND NOT CYGWIN AND NOT MSYS) set(wxPLATFORM_ARCH) if(CMAKE_GENERATOR_PLATFORM) - if (CMAKE_GENERATOR_PLATFORM STREQUAL "x64") - set(wxPLATFORM_ARCH "x64") - elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64") - set(wxPLATFORM_ARCH "arm64") + if(NOT CMAKE_GENERATOR_PLATFORM STREQUAL "Win32") + string(TOLOWER ${CMAKE_GENERATOR_PLATFORM} wxPLATFORM_ARCH) endif() elseif(CMAKE_VS_PLATFORM_NAME) - if (CMAKE_VS_PLATFORM_NAME STREQUAL "x64") - set(wxPLATFORM_ARCH "x64") - elseif(CMAKE_VS_PLATFORM_NAME STREQUAL "ARM64") - set(wxPLATFORM_ARCH "arm64") + if(NOT CMAKE_VS_PLATFORM_NAME STREQUAL "Win32") + string(TOLOWER ${CMAKE_VS_PLATFORM_NAME} wxPLATFORM_ARCH) endif() else() if(CMAKE_SIZEOF_VOID_P EQUAL 8)