Merge topic 'FindPkgConfigAlwaysAddTarget'

6f14205e08 FindPkgConfig: Always create the imported target
07d6390728 Tests: Add case covering FindPkgConfig creation of empty targets

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

Modules/FindPkgConfig.cmake

@@ -265,9 +265,7 @@ endfunction()
 
 # create an imported target from all the information returned by pkg-config
 function(_pkg_create_imp_target _prefix _imp_target_global)
-  # only create the target if it is linkable, i.e. no executables
-  if (NOT TARGET PkgConfig::${_prefix}
-      AND ( ${_prefix}_INCLUDE_DIRS OR ${_prefix}_LINK_LIBRARIES OR ${_prefix}_LDFLAGS_OTHER OR ${_prefix}_CFLAGS_OTHER ))
+  if (NOT TARGET PkgConfig::${_prefix})
     if(${_imp_target_global})
       set(_global_opt "GLOBAL")
     else()

Tests/RunCMake/FindPkgConfig/FindPkgConfig_empty_target.cmake

@@ -0,0 +1,17 @@
+# Prepare environment to reuse empty.pc
+file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/pc-empty/lib/pkgconfig" PC_PATH)
+if(UNIX)
+  string(REPLACE "\\ " " " PC_PATH "${PC_PATH}")
+endif()
+set(ENV{PKG_CONFIG_PATH} "${PC_PATH}")
+
+find_package(PkgConfig REQUIRED)
+pkg_search_module(Empty REQUIRED empty IMPORTED_TARGET)
+
+if(NOT Empty_MODULE_NAME STREQUAL "empty")
+  message(FATAL_ERROR "Wrong value for Empty_MODULE_NAME. Expected: empty, got: ${Empty_MODULE_NAME}")
+endif()
+
+if(NOT TARGET PkgConfig::Empty)
+  message(FATAL_ERROR "PkgConfig::Empty target not created")
+endif()

Tests/RunCMake/FindPkgConfig/RunCMakeTest.cmake

@@ -29,4 +29,5 @@ if (PKG_CONFIG_FOUND)
   run_cmake(FindPkgConfig_IMPORTED_TARGET)
   run_cmake(FindPkgConfig_VERSION_OPERATORS)
   run_cmake(FindPkgConfig_GET_MATCHING_MODULE_NAME)
+  run_cmake(FindPkgConfig_empty_target)
 endif ()

Tests/RunCMake/FindPkgConfig/pc-empty/lib/pkgconfig/empty.pc

@@ -0,0 +1,5 @@
+Name: Empty
+Description: Dummy package to test empty target
+Version: 1.0
+Libs:
+Cflags: