Use the provided CMake variables rather than hardcoding names for the SSL libs

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1b2427..e5a6f44 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,6 +55,7 @@ if(SPUTDEV)
   add_definitions(-DSPUTDEV)
 endif(SPUTDEV)
 
   add_definitions(-DSPUTDEV)
 endif(SPUTDEV)
 

+# Set up OpenSSL

 find_package(OpenSSL)
 
 # Select a Qt installation here, if you don't want to use system Qt
 find_package(OpenSSL)
 
 # Select a Qt installation here, if you don't want to use system Qt


@@ -113,9 +114,9 @@ endif(DEFINED STATIC)
 
 if(STATICWIN AND WIN32)
   link_libraries(imm32 winmm)  # missing by default :/
 
 if(STATICWIN AND WIN32)
   link_libraries(imm32 winmm)  # missing by default :/

-  if(OPENSSL_FOUND)
-    link_libraries(libeay32MD ssleay32MD)
-  endif(OPENSSL_FOUND)
+   if(OPENSSL_FOUND)
+     link_libraries(${OPENSSL_LIBRARIES})  # not sure if we need it in here
+   endif(OPENSSL_FOUND)

 endif(STATICWIN AND WIN32)
 
 if(WIN32)
 endif(STATICWIN AND WIN32)
 
 if(WIN32)

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 294fb4c..37110f3 100644 (file)
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -50,6 +50,8 @@ set(HEADERS
 if(OPENSSL_FOUND AND NOT QT_DEFINITIONS MATCHES "-DQT_NO_OPENSSL")
   set(SOURCES ${SOURCES} sslserver.cpp)
   set(MOC_HDRS ${MOC_HDRS} sslserver.h)
 if(OPENSSL_FOUND AND NOT QT_DEFINITIONS MATCHES "-DQT_NO_OPENSSL")
   set(SOURCES ${SOURCES} sslserver.cpp)
   set(MOC_HDRS ${MOC_HDRS} sslserver.h)

+  link_libraries(${OPENSSL_LIBRARIES})
+  include_directories(${OPENSSL_INCLUDE_DIR})

 endif(OPENSSL_FOUND AND NOT QT_DEFINITIONS MATCHES "-DQT_NO_OPENSSL")
 
 QT4_WRAP_CPP(MOC ${MOC_HDRS})
 endif(OPENSSL_FOUND AND NOT QT_DEFINITIONS MATCHES "-DQT_NO_OPENSSL")
 
 QT4_WRAP_CPP(MOC ${MOC_HDRS})