Use proper paths for searching

--HG--
branch : trunk
This commit is contained in:
click
2010-06-30 23:35:45 +02:00
parent c0dfc791de
commit cc51206403

View File

@@ -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."
)