solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

CMake: Generalize determining platform name

Browse source 
It is the same as CMAKE_VS_PLATFORM_NAME. Except for win32, which uses an empty name.
This commit is contained in:
Maarten Bent 2024-01-28 13:59:36 +01:00
parent ac3cea5bcd
commit cd7e6308cd
No known key found for this signature in database
GPG key ID: 58AAEE3F4A4FD070
2 changed files with 8 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
build/cmake/init.cmake
View file

@ -133,20 +133,12 @@ wx_string_append(wxBUILD_FILE_ID "${lib_flavour}")
set(wxPLATFORM_ARCH) set(wxPLATFORM_ARCH)
if(CMAKE_GENERATOR_PLATFORM) if(CMAKE_GENERATOR_PLATFORM)
if (CMAKE_GENERATOR_PLATFORM STREQUAL "x64") if(NOT CMAKE_GENERATOR_PLATFORM STREQUAL "Win32")
set(wxPLATFORM_ARCH "x64") string(TOLOWER ${CMAKE_GENERATOR_PLATFORM} wxPLATFORM_ARCH)
elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM")
set(wxPLATFORM_ARCH "arm")
elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64")
set(wxPLATFORM_ARCH "arm64")
endif() endif()
elseif(CMAKE_VS_PLATFORM_NAME) elseif(CMAKE_VS_PLATFORM_NAME)
if (CMAKE_VS_PLATFORM_NAME STREQUAL "x64") if(NOT CMAKE_VS_PLATFORM_NAME STREQUAL "Win32")
set(wxPLATFORM_ARCH "x64") string(TOLOWER ${CMAKE_VS_PLATFORM_NAME} wxPLATFORM_ARCH)
elseif(CMAKE_VS_PLATFORM_NAME STREQUAL "ARM")
set(wxPLATFORM_ARCH "arm")
elseif(CMAKE_VS_PLATFORM_NAME STREQUAL "ARM64")
set(wxPLATFORM_ARCH "arm64")
endif() endif()
else() else()
if(CMAKE_SIZEOF_VOID_P EQUAL 8) if(CMAKE_SIZEOF_VOID_P EQUAL 8)

12
build/cmake/wxWidgetsConfig.cmake.in
View file

@ -12,16 +12,12 @@ if(WIN32 AND NOT CYGWIN AND NOT MSYS)
set(wxPLATFORM_ARCH) set(wxPLATFORM_ARCH)
if(CMAKE_GENERATOR_PLATFORM) if(CMAKE_GENERATOR_PLATFORM)
if (CMAKE_GENERATOR_PLATFORM STREQUAL "x64") if(NOT CMAKE_GENERATOR_PLATFORM STREQUAL "Win32")
set(wxPLATFORM_ARCH "x64") string(TOLOWER ${CMAKE_GENERATOR_PLATFORM} wxPLATFORM_ARCH)
elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64")
set(wxPLATFORM_ARCH "arm64")
endif() endif()
elseif(CMAKE_VS_PLATFORM_NAME) elseif(CMAKE_VS_PLATFORM_NAME)
if (CMAKE_VS_PLATFORM_NAME STREQUAL "x64") if(NOT CMAKE_VS_PLATFORM_NAME STREQUAL "Win32")
set(wxPLATFORM_ARCH "x64") string(TOLOWER ${CMAKE_VS_PLATFORM_NAME} wxPLATFORM_ARCH)
elseif(CMAKE_VS_PLATFORM_NAME STREQUAL "ARM64")
set(wxPLATFORM_ARCH "arm64")
endif() endif()
else() else()
if(CMAKE_SIZEOF_VOID_P EQUAL 8) if(CMAKE_SIZEOF_VOID_P EQUAL 8)