Просмотр исходного кода

FindOpenSSL: Fixed crypto und ssl variable names.

Andreas Schneider 15 лет назад
Родитель
Сommit
a091ba61ce
1 измененных файлов с 8 добавлено и 4 удалено
  1. 8 4
      Modules/FindOpenSSL.cmake

+ 8 - 4
Modules/FindOpenSSL.cmake

@@ -183,7 +183,7 @@ IF(WIN32 AND NOT CYGWIN)
   ENDIF(MSVC)
 ELSE(WIN32 AND NOT CYGWIN)
 
-  FIND_LIBRARY(OPENSSL_SSL_LIBRARIES
+  FIND_LIBRARY(OPENSSL_SSL_LIBRARY
     NAMES
       ssl
       ssleay32
@@ -195,7 +195,7 @@ ELSE(WIN32 AND NOT CYGWIN)
       lib
   )
 
-  FIND_LIBRARY(OPENSSL_CRYPTO_LIBRARIES
+  FIND_LIBRARY(OPENSSL_CRYPTO_LIBRARY
     NAMES
       crypto
     HINTS
@@ -205,9 +205,13 @@ ELSE(WIN32 AND NOT CYGWIN)
       lib
   )
 
-  MARK_AS_ADVANCED(OPENSSL_CRYPTO_LIBRARIES OPENSSL_SSL_LIBRARIES)
+  MARK_AS_ADVANCED(OPENSSL_CRYPTO_LIBRARY OPENSSL_SSL_LIBRARY)
 
-  SET(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES})
+  # compat defines
+  SET(OPENSSL_SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY})
+  SET(OPENSSL_CRYPTO_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
+
+  SET(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
 
 ENDIF(WIN32 AND NOT CYGWIN)