Skip to content

Commit

Permalink
OpenSSL: replace HUNTER_UWP_PLATFORM with direct CMAKE_SYSTEM_NAME ch…
Browse files Browse the repository at this point in the history
…eck (#635)

replace HUNTER_UWP_PLATFORM with CMAKE_SYSTEM_NAME to follow CMake style.

Compare against `CMAKE_SYSTEM_NAME=WindowsStore` as described in CMake docs:
https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-for-windows-store
  • Loading branch information
Dargun authored Nov 3, 2022
1 parent 42dfbd0 commit 16491e6
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ endif()
string(COMPARE EQUAL "@HUNTER_MSVC_ARCH_TARGET@" "amd64" is_amd64)
string(COMPARE EQUAL "@HUNTER_MSVC_ARCH_TARGET@" "arm64" is_arm64)
if(is_amd64 OR is_arm64)
if(HUNTER_UWP_PLATFORM)
if("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
set(arch "VC-WIN64A-ONECORE")
else()
set(arch "VC-WIN64A")
endif()
else()
if(HUNTER_UWP_PLATFORM)
if("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
set(arch "VC-WIN32-ONECORE")
else()
set(arch "VC-WIN32")
Expand All @@ -80,7 +80,7 @@ if(DEBUG_RUNTIME)
set(arch "debug-${arch}")
endif()

if(HUNTER_UWP_PLATFORM)
if("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
hunter_add_package(NASM) # set NASM_ROOT
set(opt "no-async")
elseif(ASM_SUPPORT)
Expand All @@ -105,7 +105,7 @@ else()
set(shared "no-shared")
endif()

if(HUNTER_UWP_PLATFORM)
if("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
set(platform "store")
else()
set(platform "")
Expand Down

0 comments on commit 16491e6

Please sign in to comment.