This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 65f73c0ae178d98fec5ae0c103faebca2b02ba3b (commit)
via 1e356734a78b821525560aa1d6d5557f74f2646d (commit)
from 6e7b424240dfae88a22327c86454150f2200b7c5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65f73c0ae178d98fec5ae0c103faebca2b02ba3b
commit 65f73c0ae178d98fec5ae0c103faebca2b02ba3b
Merge: 6e7b424 1e35673
Author: Brad King <[email protected]>
AuthorDate: Tue Jun 19 13:23:48 2018 +0000
Commit: Kitware Robot <[email protected]>
CommitDate: Tue Jun 19 09:25:44 2018 -0400
Merge topic 'FindCURL-target-name'
1e356734a7 FindCURL: Rename imported target to match upstream CURL
Acked-by: Kitware Robot <[email protected]>
Acked-by: Rolf Eike Beer <[email protected]>
Merge-request: !2154
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e356734a78b821525560aa1d6d5557f74f2646d
commit 1e356734a78b821525560aa1d6d5557f74f2646d
Author: Brad King <[email protected]>
AuthorDate: Mon Jun 18 13:55:52 2018 -0400
Commit: Brad King <[email protected]>
CommitDate: Mon Jun 18 13:58:21 2018 -0400
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
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)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindCURL.cmake | 10 +++++-----
Tests/FindCURL/Test/CMakeLists.txt | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
https://cmake.org/mailman/listinfo/cmake-commits
