diff options
Diffstat (limited to 'cmake/macros')
| -rw-r--r-- | cmake/macros/CheckPlatform.cmake | 7 | ||||
| -rw-r--r-- | cmake/macros/FindOpenSSL.cmake | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/cmake/macros/CheckPlatform.cmake b/cmake/macros/CheckPlatform.cmake index 0cdf5d8ffbf..addc619207f 100644 --- a/cmake/macros/CheckPlatform.cmake +++ b/cmake/macros/CheckPlatform.cmake @@ -1,10 +1,9 @@ -# default to x86 platform. We'll check for X64 in a bit -set(PLATFORM X86) - +# check what platform we're on (64-bit or 32-bit), and create a simpler test than CMAKE_SIZEOF_VOID_P if(CMAKE_SIZEOF_VOID_P MATCHES 8) - set(PLATFORM X64) + set(PLATFORM 64) MESSAGE(STATUS "Detected 64-bit platform") else() + set(PLATFORM 32) MESSAGE(STATUS "Detected 32-bit platform") endif() diff --git a/cmake/macros/FindOpenSSL.cmake b/cmake/macros/FindOpenSSL.cmake index 01f7d20e5d2..a2357af0742 100644 --- a/cmake/macros/FindOpenSSL.cmake +++ b/cmake/macros/FindOpenSSL.cmake @@ -13,7 +13,7 @@ set(OPENSSL_FOUND 0) if( MSVC ) - if(PLATFORM MATCHES X64) + if(PLATFORM EQUAL 64) set(TMP_OPENSSL_INCLUDE_DIR "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;InstallLocation]/include" ) |