cmake fixups

This commit is contained in:
Jeff Becker 2021-10-04 10:32:26 -04:00 committed by Jeff
parent 5286d442fb
commit bf6dfaaef8
1 changed files with 4 additions and 7 deletions

View File

@ -277,15 +277,10 @@ build_external(expat
)
add_static_target(expat expat_external libexpat.a)
if(WIN32)
# fickleness from cross compile and some nodejs dipshittery causes this to be required
set(unbound_extra_opts --disable-gost --disable-ecdsa)
endif()
build_external(unbound
DEPENDS openssl_external expat_external
CONFIGURE_COMMAND ./configure ${cross_host} ${cross_rc} --prefix=${DEPS_DESTDIR} --disable-shared
--enable-static --with-libunbound-only --with-pic
${unbound_extra_opts}
--$<IF:$<BOOL:${WITH_LTO}>,enable,disable>-flto --with-ssl=${DEPS_DESTDIR}
--with-libexpat=${DEPS_DESTDIR}
"CC=${deps_cc}" "CFLAGS=${deps_CFLAGS}"
@ -339,7 +334,10 @@ set_target_properties(libzmq PROPERTIES
INTERFACE_LINK_LIBRARIES "${libzmq_link_libs}"
INTERFACE_COMPILE_DEFINITIONS "ZMQ_STATIC")
if(WITH_BOOTSTRAP)
if(NOT WITH_BOOTSTRAP)
return()
endif()
set(curl_extra)
if(WIN32)
set(curl_ssl_opts --without-ssl --with-schannel)
@ -428,4 +426,3 @@ endif()
set_target_properties(CURL::libcurl PROPERTIES
INTERFACE_LINK_LIBRARIES "${libcurl_link_libs}"
INTERFACE_COMPILE_DEFINITIONS "CURL_STATICLIB")
endif()