[Cmake-commits] CMake branch, next, updated. v2.8.7-2998-g2601a84

[Brad King]

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  2601a84ffeadfd6a3795a39d8c4f85969ea508c3 (commit)
       via  2d59c9ab17c4af84ddb09ef7da89a37871d381a7 (commit)
      from  60e9b54922aa339ca97faa1d087f5459e59ee151 (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=2601a84ffeadfd6a3795a39d8c4f85969ea508c3
commit 2601a84ffeadfd6a3795a39d8c4f85969ea508c3
Merge: 60e9b54 2d59c9a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 2 10:17:02 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 2 10:17:02 2012 -0500

    Merge topic 'fix-mingw-introspection' into next
    
    2d59c9a cmcurl: Do not hard-coded Windows check results for MinGW (#13001)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d59c9ab17c4af84ddb09ef7da89a37871d381a7
commit 2d59c9ab17c4af84ddb09ef7da89a37871d381a7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 2 10:14:00 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 2 10:15:06 2012 -0500

    cmcurl: Do not hard-coded Windows check results for MinGW (#13001)
    
    The WindowsCache.cmake file hard-codes results for MS and similar
    Windows toolchains.  They are not valid for MinGW tools and also
    interfere with cmlibarchive checks.  Allow the checks to run.

diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index 29ce25d..caa44f1 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -126,9 +126,9 @@ IF(CURL_MALLOC_DEBUG)
 ENDIF(CURL_MALLOC_DEBUG)
 
 # On windows preload settings
-IF(WIN32)
+IF(WIN32 AND NOT MINGW)
   INCLUDE(${LIBCURL_SOURCE_DIR}/Platforms/WindowsCache.cmake)
-ENDIF(WIN32)
+ENDIF()
 
 # This macro checks if the symbol exists in the library and if it
 # does, it appends library to the list.

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

Summary of changes:
 Utilities/cmcurl/CMakeLists.txt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake