[Cmake-commits] CMake branch, next, updated. v2.8.2-433-ga8ba5c6

[Mathieu Malaterre]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a8ba5c6a93eb1ee33b8197cb02d2e959ba01e52f (commit)
       via  d570ee7b5a6c1ea69d19af1ac2269af0287d6953 (commit)
       via  16168ab0c3549b6953fe95354446508ce3cc945e (commit)
       via  34f773ccfec20bb6eeaae9b35458c1767885a4cb (commit)
      from  b0531123e405d3d6daca72894734215fdae20170 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8ba5c6a93eb1ee33b8197cb02d2e959ba01e52f
commit a8ba5c6a93eb1ee33b8197cb02d2e959ba01e52f
Merge: b053112 d570ee7
Author:     Mathieu Malaterre <mathieu.malaterre at gmail.com>
AuthorDate: Sat Aug 14 13:19:55 2010 +0200
Commit:     Mathieu Malaterre <mathieu.malaterre at gmail.com>
CommitDate: Sat Aug 14 13:19:55 2010 +0200

    Merge branch 'fix-issue-11035' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d570ee7b5a6c1ea69d19af1ac2269af0287d6953
commit d570ee7b5a6c1ea69d19af1ac2269af0287d6953
Author:     Mathieu Malaterre <mathieu.malaterre at gmail.com>
AuthorDate: Sat Aug 14 13:18:31 2010 +0200
Commit:     Mathieu Malaterre <mathieu.malaterre at gmail.com>
CommitDate: Sat Aug 14 13:18:31 2010 +0200

    Fix 11035 : debug/release library configuration mistake
    
    Thanks to Dimitri Kaparis for report

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index c0cdcb1..d3d7fc2 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -74,8 +74,8 @@ IF(WIN32 AND NOT CYGWIN)
       )
     if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
       set( OPENSSL_LIBRARIES
-        optimized ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE}
-        debug ${SSL_EAY_DEBUG} ${LIB_EAY_DEBUG}
+        optimized ${SSL_EAY_RELEASE} debug ${SSL_EAY_DEBUG}
+        optimized ${LIB_EAY_RELEASE} debug ${LIB_EAY_DEBUG}
         )
     else()
       set( OPENSSL_LIBRARIES ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE} )

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindOpenSSL.cmake         |    4 ++--
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake