From 2d59c9ab17c4af84ddb09ef7da89a37871d381a7 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 2 Mar 2012 10:14:00 -0500 Subject: 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. --- Utilities/cmcurl/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index 29ce25d6..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. -- cgit v0.12