romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 16:33:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

cmake: fix enabling websocket support

Browse source 
Follow-up from 664249d095

Closes #9660
This commit is contained in:
Viktor Szakats 2022-10-06 21:34:37 +00:00
parent 0c327464ca
commit 28687ae271
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/Makefile.m32
View file

@ -107,7 +107,7 @@ endif
# comments below about exceptions). Always include them anyway to match
# behavior of other build systems.
# Linker options to exclude for shared mode executables:
# Linker options to exclude for shared mode executables.
_LDFLAGS :=
_LIBS :=
@ -152,6 +152,7 @@ ifneq ($(findstring -nghttp3,$(CFG)),)
CPPFLAGS += -I"$(NGHTTP3_PATH)/include"
_LDFLAGS += -L"$(NGHTTP3_PATH)/lib"
_LIBS += -lnghttp3
NGTCP2_PATH ?= $(PROOT)/../ngtcp2
CPPFLAGS += -DUSE_NGTCP2
CPPFLAGS += -I"$(NGTCP2_PATH)/include"
@ -165,14 +166,15 @@ ifneq ($(findstring -ssl,$(CFG)),)
CPPFLAGS += -DUSE_OPENSSL
CPPFLAGS += -DCURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG
OPENSSL_INCLUDE ?= $(OPENSSL_PATH)/include
CPPFLAGS += -I"$(OPENSSL_INCLUDE)"
OPENSSL_LIBPATH ?= $(OPENSSL_PATH)/lib
CPPFLAGS += -I"$(OPENSSL_INCLUDE)"
_LDFLAGS += -L"$(OPENSSL_LIBPATH)"
OPENSSL_LIBS ?= -lssl -lcrypto
_LIBS += $(OPENSSL_LIBS)
ifneq ($(findstring -srp,$(CFG)),)
ifneq ($(wildcard $(OPENSSL_INCLUDE)/openssl/srp.h),)
# OpenSSL 1.0.1 and later, except BoringSSL
# OpenSSL 1.0.1 and later.
CPPFLAGS += -DHAVE_OPENSSL_SRP -DUSE_TLS_SRP
endif
endif

3
lib/curl_config.h.cmake
View file

@ -786,3 +786,6 @@ ${SIZEOF_TIME_T_CODE}
/* to make the compiler know the prototypes of Windows IDN APIs */
#cmakedefine WANT_IDN_PROTOTYPES 1
/* Define to 1 to enable websocket support. */
#cmakedefine USE_WEBSOCKETS 1