Fixes to CMake build files for wxWebRequest

Fix wrong library name in wx_add_sample() for webrequest.

Also prefer to disable wxWebRequest if no backends for it are available,
for consistency with the other libraries.

build/cmake/init.cmake

@@ -308,6 +308,18 @@ if(wxUSE_LIBLZMA)
     endif()
 endif()
 
+if(wxUSE_WEBREQUEST_CURL)
+    find_package(CURL)
+    if(NOT CURL_FOUND)
+        message(WARNING "CURL not found, wxWebSessionBackendCURL won't be available")
+        wx_option_force_value(wxUSE_WEBREQUEST_CURL OFF)
+    endif()
+endif()
+if (wxUSE_WEBREQUEST AND NOT (wxUSE_WEBREQUEST_WINHTTP OR wxUSE_WEBREQUEST_URLSESSION OR wxUSE_WEBREQUEST_CURL))
+    message(WARNING "wxUSE_WEBREQUEST requires at least one backend, it won't be available")
+    wx_option_force_value(wxUSE_WEBREQUEST OFF)
+endif()
+
 if(UNIX)
     if(wxUSE_SECRETSTORE AND NOT APPLE)
         # The required APIs are always available under MSW and OS X but we must

build/cmake/lib/net/CMakeLists.txt

@@ -32,8 +32,6 @@ if(WIN32)
 endif()
 
 if (wxUSE_WEBREQUEST_CURL)
-    find_package(CURL REQUIRED)
-
     target_include_directories(wxnet PRIVATE ${CURL_INCLUDE_DIRS})
     wx_lib_link_libraries(wxnet PRIVATE ${CURL_LIBRARIES})
 endif()

build/cmake/samples/CMakeLists.txt

@@ -157,7 +157,7 @@ wx_add_sample(webview LIBRARIES wxwebview DATA ../help/doc.zip:doc.zip
 if(TARGET webviewsample AND wxUSE_STC)
     wx_exe_link_libraries(webviewsample wxstc)
 endif()
-wx_add_sample(webrequest LIBRARIES net DEPENDS wxUSE_WEBREQUEST)
+wx_add_sample(webrequest LIBRARIES wxnet DEPENDS wxUSE_WEBREQUEST)
 # widgets Sample
 set(SAMPLE_WIDGETS_SRC
     activityindicator.cpp