cleanup: CMake >= 3.13 always has CURL::libcurl (#12938)

coryan · web-flow · commit e0c98bb473f3 · 2023-10-20T13:47:21.000-04:00
Since we now require CMake &gt;= 3.13, we do not need workarounds to define
`CURL::libcurl`.
diff --git a/cmake/FindCurlWithTargets.cmake b/cmake/FindCurlWithTargets.cmake
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -32,7 +32,7 @@ if (bigtable IN_LIST GOOGLE_CLOUD_CPP_ENABLE AND storage IN_LIST
     google_cloud_cpp_add_common_options(gcs2cbt)
 endif ()
 
-include(FindCurlWithTargets)
+find_package(CURL REQUIRED)
 include(FindgRPC)
 
 if (spanner IN_LIST GOOGLE_CLOUD_CPP_ENABLE AND iam IN_LIST
diff --git a/google/cloud/google_cloud_cpp_rest_internal.cmake b/google/cloud/google_cloud_cpp_rest_internal.cmake
@@ -15,7 +15,7 @@
 # ~~~
 
 include(IncludeNlohmannJson)
-include(FindCurlWithTargets)
+find_package(CURL REQUIRED)
 find_package(OpenSSL REQUIRED)
 
 # the library
diff --git a/google/cloud/storage/benchmarks/CMakeLists.txt b/google/cloud/storage/benchmarks/CMakeLists.txt
@@ -69,7 +69,6 @@ foreach (fname ${storage_benchmark_programs})
                 google-cloud-cpp::storage
                 google-cloud-cpp::common
                 absl::strings
-                CURL::libcurl
                 Threads::Threads
                 nlohmann_json)
     google_cloud_cpp_add_common_options(${target})
@@ -104,7 +103,6 @@ foreach (fname ${storage_benchmarks_unit_tests})
                 GTest::gmock_main
                 GTest::gmock
                 GTest::gtest
-                CURL::libcurl
                 absl::strings
                 nlohmann_json)
     google_cloud_cpp_add_common_options(${target})
diff --git a/google/cloud/storage/config-grpc.cmake.in b/google/cloud/storage/config-grpc.cmake.in
@@ -24,17 +24,6 @@ find_dependency(nlohmann_json)
 find_dependency(OpenSSL)
 find_dependency(ZLIB)
 
-# Some versions of FindCURL do not define CURL::libcurl, so we define it ourselves.
-if (NOT TARGET CURL::libcurl)
-    add_library(CURL::libcurl UNKNOWN IMPORTED)
-    set_property(TARGET CURL::libcurl
-                 APPEND
-                 PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIR}")
-    set_property(TARGET CURL::libcurl
-                 APPEND
-                 PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}")
-endif ()
-
 include("${CMAKE_CURRENT_LIST_DIR}/storage-targets.cmake")
 
 # TODO(12698) - remove transition name (experimental-storage-grpc)
diff --git a/google/cloud/storage/google_cloud_cpp_storage.cmake b/google/cloud/storage/google_cloud_cpp_storage.cmake
@@ -14,7 +14,7 @@
 # limitations under the License.
 # ~~~
 
-include(FindCurlWithTargets)
+find_package(CURL REQUIRED)
 find_package(OpenSSL REQUIRED)
 
 # the client library
diff --git a/google/cloud/storage/tests/CMakeLists.txt b/google/cloud/storage/tests/CMakeLists.txt
@@ -102,7 +102,6 @@ foreach (fname IN LISTS storage_client_integration_tests)
                 GTest::gmock_main
                 GTest::gmock
                 GTest::gtest
-                CURL::libcurl
                 Threads::Threads
                 absl::strings
                 nlohmann_json)
