Use CMake's OpenSSL package

CMakeLists.txt

@@ -325,7 +325,6 @@ INCLUDE(cmake/WtFindBoost.txt)
 INCLUDE(cmake/WtFindFcgi.txt)
 INCLUDE(cmake/WtFindZlib.txt)
 INCLUDE(cmake/WtFindPng.txt)
-INCLUDE(cmake/WtFindSsl.txt)
 INCLUDE(cmake/WtFindMysql.txt)
 INCLUDE(cmake/WtFindPostgresql.txt)
 INCLUDE(cmake/WtFindOdbc.txt)
@@ -335,6 +334,9 @@ INCLUDE(cmake/WtFindGm.txt)
 INCLUDE(cmake/WtFindGL.txt)
 INCLUDE(cmake/WtFindSkia.txt)
 
+set(OPENSSL_ROOT_DIR ${SSL_PREFIX})
+find_package(OpenSSL)
+
 IF (ENABLE_UNWIND)
   INCLUDE(cmake/WtFindUnwind.txt)
 ENDIF (ENABLE_UNWIND)
@@ -595,10 +597,10 @@ IF(ENABLE_HARU AND HARU_FOUND)
   SET(WT_HAS_WPDFIMAGE true)
 ENDIF(ENABLE_HARU AND HARU_FOUND)
 
-IF(ENABLE_SSL AND SSL_FOUND)
+IF(ENABLE_SSL AND OPENSSL_FOUND)
   SET(HAVE_SSL ON)
   SET(WT_WITH_SSL true)
-ENDIF(ENABLE_SSL AND SSL_FOUND)
+ENDIF(ENABLE_SSL AND OPENSSL_FOUND)
 
 IF(ENABLE_PANGO AND PANGO_FT2_FOUND)
   SET(HAVE_PANGO ON)

src/CMakeLists.txt

@@ -545,8 +545,8 @@ ELSE(ENABLE_LIBWTTEST)
 ENDIF(ENABLE_LIBWTTEST)
 
 IF(HAVE_SSL)
-  TARGET_LINK_LIBRARIES(wt PRIVATE ${SSL_LIBRARIES})
-  INCLUDE_DIRECTORIES(${SSL_INCLUDE_DIRS})
+  TARGET_LINK_LIBRARIES(wt PRIVATE ${OPENSSL_LIBRARIES})
+  INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
   IF(WIN32)
     TARGET_LINK_LIBRARIES(wt PRIVATE Crypt32.lib)
   ENDIF(WIN32)

src/fcgi/CMakeLists.txt

@@ -20,7 +20,7 @@ IF(CONNECTOR_FCGI)
     TARGET_LINK_LIBRARIES(wtfcgi PUBLIC wt PRIVATE ${FCGI_LIB} ${FCGIPP_LIB})
 
     IF(WT_WITH_SSL)
-      TARGET_LINK_LIBRARIES(wtfcgi PRIVATE ${SSL_LIBRARIES})
+      TARGET_LINK_LIBRARIES(wtfcgi PRIVATE ${OPENSSL_LIBRARIES})
     ENDIF(WT_WITH_SSL)
 
     IF(MULTI_THREADED_BUILD)

src/http/CMakeLists.txt

@@ -56,7 +56,7 @@ IF(CONNECTOR_HTTP)
  ENDIF(WIN32)
 
  IF (HAVE_SSL)
-    SET(MY_SSL_LIBS ${SSL_LIBRARIES})
+    SET(MY_SSL_LIBS ${OPENSSL_LIBRARIES})
     ADD_DEFINITIONS(-DHTTP_WITH_SSL)
  ELSE (HAVE_SSL)
     SET(MY_SSL_LIBS "")