diff --git a/CMake/FindCares.cmake b/CMake/FindCares.cmake index cd8de0cdde..67dec09465 100644 --- a/CMake/FindCares.cmake +++ b/CMake/FindCares.cmake @@ -90,3 +90,7 @@ else() mark_as_advanced(CARES_INCLUDE_DIR CARES_LIBRARY) endif() + +if(CARES_FOUND AND WIN32) + list(APPEND CARES_LIBRARIES "iphlpapi") # for if_indextoname and others +endif() diff --git a/CMake/FindLibrtmp.cmake b/CMake/FindLibrtmp.cmake index 4f811151d1..dd3fb9e010 100644 --- a/CMake/FindLibrtmp.cmake +++ b/CMake/FindLibrtmp.cmake @@ -97,6 +97,6 @@ else() endif() endif() -if(WIN32) +if(LIBRTMP_FOUND AND WIN32) list(APPEND LIBRTMP_LIBRARIES "winmm") endif() diff --git a/CMake/FindRustls.cmake b/CMake/FindRustls.cmake index 8a231fc7e1..51f45060b7 100644 --- a/CMake/FindRustls.cmake +++ b/CMake/FindRustls.cmake @@ -71,36 +71,38 @@ else() mark_as_advanced(RUSTLS_INCLUDE_DIR RUSTLS_LIBRARY) endif() -if(APPLE) - find_library(SECURITY_FRAMEWORK NAMES "Security") - mark_as_advanced(SECURITY_FRAMEWORK) - if(NOT SECURITY_FRAMEWORK) - message(FATAL_ERROR "Security framework not found") - endif() - list(APPEND RUSTLS_LIBRARIES "-framework Security") +if(RUSTLS_FOUND) + if(APPLE) + find_library(SECURITY_FRAMEWORK NAMES "Security") + mark_as_advanced(SECURITY_FRAMEWORK) + if(NOT SECURITY_FRAMEWORK) + message(FATAL_ERROR "Security framework not found") + endif() + list(APPEND RUSTLS_LIBRARIES "-framework Security") - find_library(FOUNDATION_FRAMEWORK NAMES "Foundation") - mark_as_advanced(FOUNDATION_FRAMEWORK) - if(NOT FOUNDATION_FRAMEWORK) - message(FATAL_ERROR "Foundation framework not found") - endif() - list(APPEND RUSTLS_LIBRARIES "-framework Foundation") -elseif(NOT WIN32) - find_library(PTHREAD_LIBRARY NAMES "pthread") - if(PTHREAD_LIBRARY) - list(APPEND RUSTLS_LIBRARIES ${PTHREAD_LIBRARY}) - endif() - mark_as_advanced(PTHREAD_LIBRARY) + find_library(FOUNDATION_FRAMEWORK NAMES "Foundation") + mark_as_advanced(FOUNDATION_FRAMEWORK) + if(NOT FOUNDATION_FRAMEWORK) + message(FATAL_ERROR "Foundation framework not found") + endif() + list(APPEND RUSTLS_LIBRARIES "-framework Foundation") + elseif(NOT WIN32) + find_library(PTHREAD_LIBRARY NAMES "pthread") + if(PTHREAD_LIBRARY) + list(APPEND RUSTLS_LIBRARIES ${PTHREAD_LIBRARY}) + endif() + mark_as_advanced(PTHREAD_LIBRARY) - find_library(DL_LIBRARY NAMES "dl") - if(DL_LIBRARY) - list(APPEND RUSTLS_LIBRARIES ${DL_LIBRARY}) - endif() - mark_as_advanced(DL_LIBRARY) + find_library(DL_LIBRARY NAMES "dl") + if(DL_LIBRARY) + list(APPEND RUSTLS_LIBRARIES ${DL_LIBRARY}) + endif() + mark_as_advanced(DL_LIBRARY) - find_library(MATH_LIBRARY NAMES "m") - if(MATH_LIBRARY) - list(APPEND RUSTLS_LIBRARIES ${MATH_LIBRARY}) + find_library(MATH_LIBRARY NAMES "m") + if(MATH_LIBRARY) + list(APPEND RUSTLS_LIBRARIES ${MATH_LIBRARY}) + endif() + mark_as_advanced(MATH_LIBRARY) endif() - mark_as_advanced(MATH_LIBRARY) endif() diff --git a/CMake/FindWolfSSL.cmake b/CMake/FindWolfSSL.cmake index 9fdad66d2c..3163fee9b9 100644 --- a/CMake/FindWolfSSL.cmake +++ b/CMake/FindWolfSSL.cmake @@ -90,7 +90,7 @@ else() mark_as_advanced(WOLFSSL_INCLUDE_DIR WOLFSSL_LIBRARY) endif() -if(NOT WIN32) +if(WOLFSSL_FOUND AND NOT WIN32) find_library(MATH_LIBRARY NAMES "m") if(MATH_LIBRARY) list(APPEND WOLFSSL_LIBRARIES ${MATH_LIBRARY}) # for log and pow