Buildsystem/CMake: Adjust headerlocations on Windows so that they are correctly detected.

- Remove caching of OpenSSL info (for you, zor!)
- Adjust MySQL header-location in a DB-file (haha to Machiavelli, more work for you!)
- Add OpenSSL-header location to the shared-library (Fixes build)

--HG--
branch : trunk

1 files changed, 6 insertions, 10 deletions

diff --git a/cmake/FindOpenSSL.cmake b/cmake/FindOpenSSL.cmake
index d045b539b98..29a4656032a 100644
--- a/cmake/FindOpenSSL.cmake
+++ b/cmake/FindOpenSSL.cmake
@@ -10,25 +10,21 @@
 # also defined, but not for general use are
 # OPENSSL_LIBRARY, where to find the MySQL library.
 
-if( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES )
-  # in cache already
-  set(OPENSSL_FOUND 1)
-else( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES )
   set(OPENSSL_FOUND 0)
 
   if(WIN32)
     if(PLATFORM MATCHES X64)
       set(TMP_OPENSSL_INCLUDE_DIR
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;InstallLocation]/include/openssl"
+        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;InstallLocation]/include"
       )
       set(TMP_OPENSSL_LIBRARIES
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;InstallLocation]/lib"
       )
     else()
       set(TMP_OPENSSL_INCLUDE_DIR
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/include/openssl"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/include/openssl"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/include/openssl"
+        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/include"
+        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/include"
+        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/include"
       )
       set(TMP_OPENSSL_LIBRARIES
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/lib"
@@ -40,7 +36,7 @@ else( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES )
 
   find_path(OPENSSL_INCLUDE_DIR
     NAMES
-      ssl.h
+      openssl/ssl.h
     PATHS
       /usr/include
       /usr/include/openssl
@@ -88,5 +84,5 @@ else( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES )
   else( OPENSSL_LIBRARIES )
     message(FATAL_ERROR "Could not find OpenSSL libraries! Please install the library before continuing")
   endif( OPENSSL_LIBRARIES )
+
   mark_as_advanced( OPENSSL_FOUND OPENSSL_LIBRARIES OPENSSL_EXTRA_LIBRARIES OPENSSL_INCLUDE_DIR )
-endif( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES )