diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-19 13:23:48 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-06-19 13:25:44 (GMT) |
| commit | 65f73c0ae178d98fec5ae0c103faebca2b02ba3b (patch) | |
| tree | e974d364bb8fcf7f211648210740b8f2b7c515c8 | |
| parent | 6e7b424240dfae88a22327c86454150f2200b7c5 (diff) | |
| parent | 1e356734a78b821525560aa1d6d5557f74f2646d (diff) | |
| download | CMake-65f73c0ae178d98fec5ae0c103faebca2b02ba3b.zip CMake-65f73c0ae178d98fec5ae0c103faebca2b02ba3b.tar.gz CMake-65f73c0ae178d98fec5ae0c103faebca2b02ba3b.tar.bz2 | |
Merge topic 'FindCURL-target-name'
1e356734a7 FindCURL: Rename imported target to match upstream CURL
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rolf Eike Beer <eike@sf-mail.de>
Merge-request: !2154
| -rw-r--r-- | Modules/FindCURL.cmake | 10 | ||||
| -rw-r--r-- | Tests/FindCURL/Test/CMakeLists.txt | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Modules/FindCURL.cmake b/Modules/FindCURL.cmake index e66ae92..a549765 100644 --- a/Modules/FindCURL.cmake +++ b/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() diff --git a/Tests/FindCURL/Test/CMakeLists.txt b/Tests/FindCURL/Test/CMakeLists.txt index f0e5568..c3c719b 100644 --- a/Tests/FindCURL/Test/CMakeLists.txt +++ b/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) |