libs: adjusted CMakeList for new nghttp2 cURL option

This commit is contained in:
Remy Marquis 2017-07-01 16:51:34 +02:00
parent 49247cead3
commit b39b4258f6

View file

@ -114,7 +114,7 @@ if(WIN32)
ExternalProject_Add(bundled_curl
SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/curl
BINARY_DIR ${LIBS_BINARYDIR_DIR}/curl
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -DBUILD_CURL_EXE=0 -DCURL_STATICLIB=1 -DENABLE_ARES=0 -DENABLE_THREADED_RESOLVER=1 -DENABLE_DEBUG=0 -DENABLE_CURLDEBUG=0 -DBUILD_TESTING=0 -DHTTP_ONLY=1 -DENABLE_IPV6=1 -DENABLE_MANUAL=0 -DCMAKE_USE_OPENSSL=0 -DCURL_WINDOWS_SSPI=0 -DCURL_ZLIB=1 -DCMAKE_USE_LIBSSH2=0 -DCMAKE_USE_GSSAPI=0 -DENABLE_UNIX_SOCKETS=1 -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR}/curl
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -DBUILD_CURL_EXE=0 -DCURL_STATICLIB=1 -DENABLE_ARES=0 -DENABLE_THREADED_RESOLVER=1 -DENABLE_DEBUG=0 -DENABLE_CURLDEBUG=0 -DBUILD_TESTING=0 -DHTTP_ONLY=1 -DENABLE_IPV6=1 -DENABLE_MANUAL=0 -DCMAKE_USE_OPENSSL=0 -DCMAKE_USE_LIBSSH2=0 -DUSE_NGHTTP2=0 -DCURL_WINDOWS_SSPI=0 -DCURL_ZLIB=1 -DCMAKE_USE_GSSAPI=0 -DENABLE_UNIX_SOCKETS=1 -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR}/curl
INSTALL_COMMAND ""
)
@ -413,7 +413,7 @@ elseif(UNIX)
--enable-proxy --disable-dict --disable-telnet
--disable-tftp --disable-pop3 --disable-imap
--disable-smb --disable-smtp --disable-gopher
--without-ssl --without-libssh2
--without-ssl --without-libssh2 --without-nghttp2
--without-gssapi --with-zlib
--disable-ares --enable-threaded-resolver
--enable-ipv6 --enable-unix-sockets