diff options
| author | click <none@none> | 2010-06-30 23:35:45 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-06-30 23:35:45 +0200 |
| commit | cc512064036013b6b693c05d9432fed99a31f700 (patch) | |
| tree | 66e787e23edb7e41c507fa4f04e4fd420c0b4345 | |
| parent | c0dfc791dec0f33ad623ab3a648dc0ff500cc5ae (diff) | |
Use proper paths for searching
--HG--
branch : trunk
| -rw-r--r-- | cmake/FindOpenSSL.cmake | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/cmake/FindOpenSSL.cmake b/cmake/FindOpenSSL.cmake index bafe35266d6..d045b539b98 100644 --- a/cmake/FindOpenSSL.cmake +++ b/cmake/FindOpenSSL.cmake @@ -17,15 +17,24 @@ else( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES ) set(OPENSSL_FOUND 0) if(WIN32) - if(CMAKE_CL_64) - set(tmp_OPENSSL_DIR + if(PLATFORM MATCHES X64) + set(TMP_OPENSSL_INCLUDE_DIR "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;InstallLocation]/include/openssl" ) + set(TMP_OPENSSL_LIBRARIES + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;InstallLocation]/lib" + ) else() - set(tmp_OPENSSL_DIR + set(TMP_OPENSSL_INCLUDE_DIR + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/include/openssl" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/include/openssl" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/include/openssl" ) + set(TMP_OPENSSL_LIBRARIES + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/lib" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/lib" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/lib" + ) endif() endif() @@ -38,7 +47,7 @@ else( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES ) /usr/local/include /usr/local/include/openssl /usr/local/openssl/include - ${tmp_OPENSSL_DIR} + ${TMP_OPENSSL_INCLUDE_DIR} DOC "Specify the directory containing openssl.h." ) @@ -53,7 +62,7 @@ else( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES ) /usr/local/lib /usr/local/lib/ssl /usr/local/ssl/lib - ${tmp_OPENSSL_DIR} + ${TMP_OPENSSL_LIBRARIES} DOC "Specify the OpenSSL library here." ) @@ -62,7 +71,7 @@ else( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES ) NAMES libeay32 PATHS - ${tmp_OPENSSL_DIR} + ${TMP_OPENSSL_LIBRARIES} DOC "if more libraries are necessary to link in a OpenSSL client, specify them here." ) |