diff options
| author | David Cole <david.cole@kitware.com> | 2012-03-06 20:25:38 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-03-06 20:25:38 (GMT) |
| commit | 155e6443657800eeb9e4dd20aa00a21b4610148e (patch) | |
| tree | e37e3023fe319b180239ba1e4dc2c366e8371f0d | |
| parent | 9c77a1492aedc61fc990b3fc7ad06dbc5cc0bec4 (diff) | |
| parent | 2d59c9ab17c4af84ddb09ef7da89a37871d381a7 (diff) | |
| download | CMake-155e6443657800eeb9e4dd20aa00a21b4610148e.zip CMake-155e6443657800eeb9e4dd20aa00a21b4610148e.tar.gz CMake-155e6443657800eeb9e4dd20aa00a21b4610148e.tar.bz2 | |
Merge topic 'fix-mingw-introspection'
2d59c9a cmcurl: Do not hard-coded Windows check results for MinGW (#13001)
| -rw-r--r-- | Utilities/cmcurl/CMakeLists.txt | 4 |
1 files 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. |