Browse Source

FindCURL: Rename imported target to match upstream CURL

Upstream CURL provides imported target `CURL::libcurl`.  Rename the
target added by `FindCURL` to match.  We don't need compatibility with
the old name because it has never been in a CMake release (except a 3.12
release candidate).

Suggested-by: Jakub Zakrzewski <[email protected]>
Acked-by: Rolf Eike Beer <[email protected]>
Fixes: #18091
Brad King 7 years ago
parent
commit
1e356734a7
2 changed files with 6 additions and 6 deletions
  1. 5 5
      Modules/FindCURL.cmake
  2. 1 1
      Tests/FindCURL/Test/CMakeLists.txt

+ 5 - 5
Modules/FindCURL.cmake

@@ -10,7 +10,7 @@
 # IMPORTED Targets
 # ^^^^^^^^^^^^^^^^
 #
-# This module defines :prop_tgt:`IMPORTED` target ``CURL::CURL``, if
+# This module defines :prop_tgt:`IMPORTED` target ``CURL::libcurl``, if
 # curl has been found.
 #
 # Result Variables
@@ -67,9 +67,9 @@ if(CURL_FOUND)
   set(CURL_LIBRARIES ${CURL_LIBRARY})
   set(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR})
 
-  if(NOT TARGET CURL::CURL)
-    add_library(CURL::CURL UNKNOWN IMPORTED)
-    set_target_properties(CURL::CURL PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIRS}")
-    set_property(TARGET CURL::CURL APPEND PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}")
+  if(NOT TARGET CURL::libcurl)
+    add_library(CURL::libcurl UNKNOWN IMPORTED)
+    set_target_properties(CURL::libcurl PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIRS}")
+    set_property(TARGET CURL::libcurl APPEND PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}")
   endif()
 endif()

+ 1 - 1
Tests/FindCURL/Test/CMakeLists.txt

@@ -7,7 +7,7 @@ find_package(CURL REQUIRED)
 add_definitions(-DCMAKE_EXPECTED_CURL_VERSION="${CURL_VERSION_STRING}")
 
 add_executable(test_tgt main.c)
-target_link_libraries(test_tgt CURL::CURL)
+target_link_libraries(test_tgt CURL::libcurl)
 add_test(NAME test_tgt COMMAND test_tgt)
 
 add_executable(test_var main.c)