diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-04 11:40:04 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-10-10 15:15:20 (GMT) |
| commit | bb7591487d95ff9b638c7c1702a8dca2a9e39b45 (patch) | |
| tree | e30916a19ac42f9be01ecf214c6492e83666a046 | |
| parent | 9e3ef40edb6eae36e822c129bec5d4ee9de0dd57 (diff) | |
| download | CMake-bb7591487d95ff9b638c7c1702a8dca2a9e39b45.zip CMake-bb7591487d95ff9b638c7c1702a8dca2a9e39b45.tar.gz CMake-bb7591487d95ff9b638c7c1702a8dca2a9e39b45.tar.bz2 | |
curl: Update build within CMake to account for 7.56 changes
| -rw-r--r-- | Utilities/cmcurl/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Utilities/cmcurl/lib/curl_config.h.cmake | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index 93dff33..a831f7f 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -24,6 +24,7 @@ set(CURL_DISABLE_TFTP ON CACHE INTERNAL "Disable curl tftp protocol?") set(CURL_DISABLE_VERBOSE_STRINGS OFF CACHE INTERNAL "Do not disable curl verbosity") set(CURL_HIDDEN_SYMBOLS OFF CACHE INTERNAL "No curl hidden symbols") set(CURL_STATICLIB ON CACHE INTERNAL "Static curl") +set(CURL_WERROR OFF CACHE INTERNAL "Turn compiler warnings into errors") set(DISABLED_THREADSAFE OFF CACHE INTERNAL "Curl can use thread-safe functions") set(ENABLE_ARES OFF CACHE INTERNAL "No curl c-ares support") set(ENABLE_CURLDEBUG OFF CACHE INTERNAL "No curl TrackMemory features") @@ -33,6 +34,7 @@ set(ENABLE_MANUAL OFF CACHE INTERNAL "No curl built-in manual") set(ENABLE_THREADED_RESOLVER OFF CACHE INTERNAL "No curl POSIX threaded DNS lookup") set(ENABLE_UNIX_SOCKETS OFF CACHE INTERNAL "No curl Unix domain sockets support") set(HTTP_ONLY OFF CACHE INTERNAL "Curl is not http-only") +set(PICKY_COMPILER OFF CACHE INTERNAL "Enable picky compiler options") set(USE_WIN32_LDAP OFF CACHE INTERNAL "No curl Windows LDAP") if(CMAKE_USE_OPENSSL) elseif(WIN32) @@ -204,8 +206,10 @@ if (ENABLE_CURLDEBUG) set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS CURLDEBUG) endif() +if(0) # This code not needed for building within CMake. # For debug libs and exes, add "-d" postfix set(CMAKE_DEBUG_POSTFIX "-d" CACHE STRING "Set debug library postfix") +endif() # initialize CURL_LIBS set(CURL_LIBS "") diff --git a/Utilities/cmcurl/lib/curl_config.h.cmake b/Utilities/cmcurl/lib/curl_config.h.cmake index 274dd45..abe9ffe 100644 --- a/Utilities/cmcurl/lib/curl_config.h.cmake +++ b/Utilities/cmcurl/lib/curl_config.h.cmake @@ -880,7 +880,7 @@ @SIZEOF_OFF_T_CODE@ /* The size of `curl_off_t', as computed by sizeof. */ -#cmakedefine SIZEOF_CURL_OFF_T ${SIZEOF_CURL_OFF_T} +@SIZEOF_CURL_OFF_T_CODE@ /* The size of `size_t', as computed by sizeof. */ @SIZEOF_SIZE_T_CODE@ |