Merge topic 'FindProtobuf-targets'

a5ccddf0 FindProtobuf: Rename imported targets to match upstream names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !876

2 files changed, 30 insertions, 30 deletions

diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake
index 6dc0444..abc7518 100644
--- a/Modules/FindProtobuf.cmake
+++ b/Modules/FindProtobuf.cmake
@@ -42,11 +42,11 @@
 #
 # The following :prop_tgt:`IMPORTED` targets are also defined:
 #
-# ``Protobuf::protobuf``
+# ``protobuf::libprotobuf``
 #   The protobuf library.
-# ``Protobuf::protobuf-lite``
+# ``protobuf::libprotobuf-lite``
 #   The protobuf lite library.
-# ``Protobuf::protoc``
+# ``protobuf::libprotoc``
 #   The protoc library.
 #
 # The following cache variables are also available to set or use:
@@ -420,72 +420,72 @@ if(Protobuf_INCLUDE_DIR)
   endif()
 
   if(Protobuf_LIBRARY)
-      if(NOT TARGET Protobuf::protobuf)
-          add_library(Protobuf::protobuf UNKNOWN IMPORTED)
-          set_target_properties(Protobuf::protobuf PROPERTIES
+      if(NOT TARGET protobuf::libprotobuf)
+          add_library(protobuf::libprotobuf UNKNOWN IMPORTED)
+          set_target_properties(protobuf::libprotobuf PROPERTIES
             INTERFACE_INCLUDE_DIRECTORIES "${Protobuf_INCLUDE_DIR}")
           if(EXISTS "${Protobuf_LIBRARY}")
-            set_target_properties(Protobuf::protobuf PROPERTIES
+            set_target_properties(protobuf::libprotobuf PROPERTIES
               IMPORTED_LOCATION "${Protobuf_LIBRARY}")
           endif()
           if(EXISTS "${Protobuf_LIBRARY_RELEASE}")
-            set_property(TARGET Protobuf::protobuf APPEND PROPERTY
+            set_property(TARGET protobuf::libprotobuf APPEND PROPERTY
               IMPORTED_CONFIGURATIONS RELEASE)
-            set_target_properties(Protobuf::protobuf PROPERTIES
+            set_target_properties(protobuf::libprotobuf PROPERTIES
               IMPORTED_LOCATION_RELEASE "${Protobuf_LIBRARY_RELEASE}")
           endif()
           if(EXISTS "${Protobuf_LIBRARY_DEBUG}")
-            set_property(TARGET Protobuf::protobuf APPEND PROPERTY
+            set_property(TARGET protobuf::libprotobuf APPEND PROPERTY
               IMPORTED_CONFIGURATIONS DEBUG)
-            set_target_properties(Protobuf::protobuf PROPERTIES
+            set_target_properties(protobuf::libprotobuf PROPERTIES
               IMPORTED_LOCATION_DEBUG "${Protobuf_LIBRARY_DEBUG}")
           endif()
       endif()
   endif()
 
   if(Protobuf_LITE_LIBRARY)
-      if(NOT TARGET Protobuf::protobuf-lite)
-          add_library(Protobuf::protobuf-lite UNKNOWN IMPORTED)
-          set_target_properties(Protobuf::protobuf-lite PROPERTIES
+      if(NOT TARGET protobuf::libprotobuf-lite)
+          add_library(protobuf::libprotobuf-lite UNKNOWN IMPORTED)
+          set_target_properties(protobuf::libprotobuf-lite PROPERTIES
             INTERFACE_INCLUDE_DIRECTORIES "${Protobuf_INCLUDE_DIR}")
           if(EXISTS "${Protobuf_LITE_LIBRARY}")
-            set_target_properties(Protobuf::protobuf-lite PROPERTIES
+            set_target_properties(protobuf::libprotobuf-lite PROPERTIES
               IMPORTED_LOCATION "${Protobuf_LITE_LIBRARY}")
           endif()
           if(EXISTS "${Protobuf_LITE_LIBRARY_RELEASE}")
-            set_property(TARGET Protobuf::protobuf-lite APPEND PROPERTY
+            set_property(TARGET protobuf::libprotobuf-lite APPEND PROPERTY
               IMPORTED_CONFIGURATIONS RELEASE)
-            set_target_properties(Protobuf::protobuf-lite PROPERTIES
+            set_target_properties(protobuf::libprotobuf-lite PROPERTIES
               IMPORTED_LOCATION_RELEASE "${Protobuf_LITE_LIBRARY_RELEASE}")
           endif()
           if(EXISTS "${Protobuf_LITE_LIBRARY_DEBUG}")
-            set_property(TARGET Protobuf::protobuf-lite APPEND PROPERTY
+            set_property(TARGET protobuf::libprotobuf-lite APPEND PROPERTY
               IMPORTED_CONFIGURATIONS DEBUG)
-            set_target_properties(Protobuf::protobuf-lite PROPERTIES
+            set_target_properties(protobuf::libprotobuf-lite PROPERTIES
               IMPORTED_LOCATION_DEBUG "${Protobuf_LITE_LIBRARY_DEBUG}")
           endif()
       endif()
   endif()
 
   if(Protobuf_PROTOC_LIBRARY)
-      if(NOT TARGET Protobuf::protoc)
-          add_library(Protobuf::protoc UNKNOWN IMPORTED)
-          set_target_properties(Protobuf::protoc PROPERTIES
+      if(NOT TARGET protobuf::libprotoc)
+          add_library(protobuf::libprotoc UNKNOWN IMPORTED)
+          set_target_properties(protobuf::libprotoc PROPERTIES
             INTERFACE_INCLUDE_DIRECTORIES "${Protobuf_INCLUDE_DIR}")
           if(EXISTS "${Protobuf_PROTOC_LIBRARY}")
-            set_target_properties(Protobuf::protoc PROPERTIES
+            set_target_properties(protobuf::libprotoc PROPERTIES
               IMPORTED_LOCATION "${Protobuf_PROTOC_LIBRARY}")
           endif()
           if(EXISTS "${Protobuf_PROTOC_LIBRARY_RELEASE}")
-            set_property(TARGET Protobuf::protoc APPEND PROPERTY
+            set_property(TARGET protobuf::libprotoc APPEND PROPERTY
               IMPORTED_CONFIGURATIONS RELEASE)
-            set_target_properties(Protobuf::protoc PROPERTIES
+            set_target_properties(protobuf::libprotoc PROPERTIES
               IMPORTED_LOCATION_RELEASE "${Protobuf_PROTOC_LIBRARY_RELEASE}")
           endif()
           if(EXISTS "${Protobuf_PROTOC_LIBRARY_DEBUG}")
-            set_property(TARGET Protobuf::protoc APPEND PROPERTY
+            set_property(TARGET protobuf::libprotoc APPEND PROPERTY
               IMPORTED_CONFIGURATIONS DEBUG)
-            set_target_properties(Protobuf::protoc PROPERTIES
+            set_target_properties(protobuf::libprotoc PROPERTIES
               IMPORTED_LOCATION_DEBUG "${Protobuf_PROTOC_LIBRARY_DEBUG}")
           endif()
       endif()
diff --git a/Tests/FindProtobuf/Test/CMakeLists.txt b/Tests/FindProtobuf/Test/CMakeLists.txt
index d7a5081..8b6e38a 100644
--- a/Tests/FindProtobuf/Test/CMakeLists.txt
+++ b/Tests/FindProtobuf/Test/CMakeLists.txt
@@ -5,7 +5,7 @@ include(CTest)
 find_package(Protobuf REQUIRED)
 
 add_executable(test_tgt main.cxx)
-target_link_libraries(test_tgt Protobuf::protobuf)
+target_link_libraries(test_tgt protobuf::libprotobuf)
 add_test(NAME test_tgt COMMAND test_tgt)
 
 add_executable(test_var main.cxx)
@@ -14,7 +14,7 @@ target_link_libraries(test_var PRIVATE ${Protobuf_LIBRARIES})
 add_test(NAME test_var COMMAND test_var)
 
 add_executable(test_tgt_lite main.cxx)
-target_link_libraries(test_tgt_lite Protobuf::protobuf-lite)
+target_link_libraries(test_tgt_lite protobuf::libprotobuf-lite)
 add_test(NAME test_tgt_lite COMMAND test_tgt_lite)
 
 add_executable(test_var_lite main.cxx)
@@ -23,7 +23,7 @@ target_link_libraries(test_var_lite PRIVATE ${Protobuf_LITE_LIBRARIES})
 add_test(NAME test_var_lite COMMAND test_var_lite)
 
 add_executable(test_tgt_protoc main-protoc.cxx)
-target_link_libraries(test_tgt_protoc Protobuf::protoc)
+target_link_libraries(test_tgt_protoc protobuf::libprotoc)
 add_test(NAME test_tgt_protoc COMMAND test_tgt_protoc)
 
 add_executable(test_var_protoc main-protoc.cxx)