GerbilSoft/rvthtool
1
Fork 0
mirror of https://github.com/GerbilSoft/rvthtool.git synced 2025-06-18 11:35:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

[cmake] FindNettle.cmake: Use CPU_* instead of CMAKE_SYSTEM_PROCESSOR.

Browse Source 
The 32-bit AppVeyor build ended up using lib.amd64, which failed.
This commit is contained in:
David Korth 2019-12-30 14:29:02 -05:00
parent 666f02a98f
commit 1245d127b7
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/modules/FindNettle.cmake
View File

@ -27,10 +27,13 @@ IF(NOT WIN32)
ELSE(NOT WIN32)
# Use the included Win32 build of Nettle.
INCLUDE(DirInstallPaths)
STRING(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" arch)
IF(NOT arch MATCHES "^(i.|x)86$|^x86_64$|^amd64$")
MESSAGE(FATAL_ERROR "Architecture ${arch} is not supported.")
ENDIF(NOT arch MATCHES "^(i.|x)86$|^x86_64$|^amd64$")
IF(CPU_i386)
SET(arch "i386")
ELSEIF(CPU_amd64)
SET(arch "amd64")
ELSE()
MESSAGE(FATAL_ERROR "Unsupported CPU architecture, please fix!")
ENDIF()
SET(NETTLE_WIN32_BASE_PATH "${CMAKE_SOURCE_DIR}/extlib/nettle.win32")
SET(NETTLE_INCLUDE_DIRS "${NETTLE_WIN32_BASE_PATH}/include")