Merge pull request #2486

8b1acc9 Fix OpenSSL 1.1 detection for static builds (hyc)

CMakeLists.txt

@@ -320,6 +320,12 @@ else()
   message(STATUS "Stack trace on exception disabled")
 endif()
 
+if (UNIX AND NOT APPLE)
+  # Note that at the time of this writing the -Wstrict-prototypes flag added below will make this fail
+  set(THREADS_PREFER_PTHREAD_FLAG ON)
+  find_package(Threads)
+endif()
+
 # Handle OpenSSL, used for sha256sum on binary updates
 if (APPLE AND NOT IOS)
   if (NOT OpenSSL_DIR)
@@ -333,16 +339,10 @@ endif()
 find_package(OpenSSL REQUIRED)
 if(STATIC AND NOT IOS)
   if(UNIX)
-    set(OPENSSL_LIBRARIES "${OPENSSL_LIBRARIES};${CMAKE_DL_LIBS}")
+    set(OPENSSL_LIBRARIES "${OPENSSL_LIBRARIES};${CMAKE_DL_LIBS};${CMAKE_THREAD_LIBS_INIT}")
   endif()
 endif()
 
-if (UNIX AND NOT APPLE)
-  # Note that at the time of this writing the -Wstrict-prototypes flag added below will make this fail
-  set(THREADS_PREFER_PTHREAD_FLAG ON)
-  find_package(Threads)
-endif()
-
 add_definitions(-DAUTO_INITIALIZE_EASYLOGGINGPP)
 
 add_subdirectory(external)