[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2756-g1d8f9ac
Brad King
brad.king at kitware.com
Fri Apr 12 08:52:21 EDT 2013
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 1d8f9ac00645e026c1168ee814fb83d56885cea2 (commit)
via 1b614e018cf835e6e2227ecaa45f33d798d39819 (commit)
from afd4254242f6a14158eac893e5148ed87999250c (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=1d8f9ac00645e026c1168ee814fb83d56885cea2
commit 1d8f9ac00645e026c1168ee814fb83d56885cea2
Merge: afd4254 1b614e0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 12 08:52:17 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 12 08:52:17 2013 -0400
Merge topic 'FindOpenSSL-cross-compiling' into next
1b614e0 FindOpenSSL: Fix spelling of CMAKE_CROSSCOMPILING (#14075)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b614e018cf835e6e2227ecaa45f33d798d39819
commit 1b614e018cf835e6e2227ecaa45f33d798d39819
Author: Robin Lee <robinlee.sysu at gmail.com>
AuthorDate: Fri Apr 12 08:47:59 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 12 08:50:06 2013 -0400
FindOpenSSL: Fix spelling of CMAKE_CROSSCOMPILING (#14075)
Use of the mis-spelled variable name 'CMAKE_CROSS_COMPILING' was
introduced by commit 4b793ad1 (FindOpenSSL: find cross-compiled OpenSSL
from MinGW, 2012-07-23). Fix the spelling.
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 224c88e..a7224ea 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -143,7 +143,7 @@ if(WIN32 AND NOT CYGWIN)
# same player, for MingW
set(LIB_EAY_NAMES libeay32)
set(SSL_EAY_NAMES ssleay32)
- if(CMAKE_CROSS_COMPILING)
+ if(CMAKE_CROSSCOMPILING)
list(APPEND LIB_EAY_NAMES crypto)
list(APPEND SSL_EAY_NAMES ssl)
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindOpenSSL.cmake | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list