]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
On the cmake build process, it is better to use FindOpenSSL module
authorMichihiro NAKAJIMA <ggcueroad@gmail.com>
Wed, 18 Mar 2009 22:05:18 +0000 (18:05 -0400)
committerMichihiro NAKAJIMA <ggcueroad@gmail.com>
Wed, 18 Mar 2009 22:05:18 +0000 (18:05 -0400)
to find out OpenSSL library.

SVN-Revision: 798

CMakeLists.txt

index 2234cf03cdf5ac7ece0946ddd6e68a092190160d..5cab38eecc7fa69442251e48cba71ff12b758d90 100644 (file)
@@ -182,6 +182,14 @@ CHECK_INCLUDE_FILE(strings.h        HAVE_STRINGS_H)
 CHECK_INCLUDE_FILE(sys/stat.h       HAVE_SYS_STAT_H)
 CHECK_INCLUDE_FILE(sys/types.h      HAVE_SYS_TYPES_H)
 
+#
+# Find OpenSSL
+#
+FIND_PACKAGE(OpenSSL)
+IF(OPENSSL_FOUND)
+  INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
+  LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_LIBRARIES})
+ENDIF(OPENSSL_FOUND)
 #
 # Check MD5/RMD160/SHA headers
 #
@@ -201,15 +209,12 @@ FIND_LIBRARY(CRYPTO_LIBRARY NAMES crypto)
 IF(CRYPTO_LIBRARY)
   LIST(APPEND ADDITIONAL_LIBS ${CRYPTO_LIBRARY})
 ELSE(CRYPTO_LIBRARY)
-  FIND_LIBRARY(SSL_LIBRARY NAMES ssl)
-  IF(SSL_LIBRARY)
-    LIST(APPEND ADDITIONAL_LIBS ${SSL_LIBRARY})
-  ELSE(SSL_LIBRARY)
+  IF(NOT OPENSSL_FOUND)
     FIND_LIBRARY(MD_LIBRARY NAMES md)
     IF(MD_LIBRARY)
       LIST(APPEND ADDITIONAL_LIBS ${MD_LIBRARY})
     ENDIF(MD_LIBRARY)
-  ENDIF(SSL_LIBRARY)
+  ENDIF(NOT OPENSSL_FOUND)
 ENDIF(CRYPTO_LIBRARY)
 #
 # Check MD5/RMD160/SHA functions