Merge topic 'LINK_LIBRARY-updates'

397ee55cd6 genex-LINK_LIBRARY: rename configuration variables

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

27 files changed, 90 insertions, 90 deletions

diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature2.cmake b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature2.cmake
index 15b5ca0..2c9efce 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature2.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature2.cmake
@@ -1,6 +1,6 @@
 enable_language(C)
 
-set(CMAKE_C_LINK_USING_feat_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat_SUPPORTED TRUE)
 
 add_library(dep SHARED empty.c)
 
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature3-stderr.txt b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature3-stderr.txt
index 69963fe..48cf51e 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature3-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature3-stderr.txt
@@ -1,5 +1,5 @@
 CMake Error at bad-feature3.cmake:[0-9]+ \(add_library\):
-  Feature 'feat', specified by variable 'CMAKE_C_LINK_USING_feat', is
+  Feature 'feat', specified by variable 'CMAKE_C_LINK_LIBRARY_USING_feat', is
   malformed \("<LIBRARY>", "<LIB_ITEM>", or "<LINK_ITEM>" patterns are
   missing\) and cannot be used to link target 'lib'.
 Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature3.cmake b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature3.cmake
index 7960465..dab6a64 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature3.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature3.cmake
@@ -1,7 +1,7 @@
 enable_language(C)
 
-set(CMAKE_C_LINK_USING_feat_SUPPORTED TRUE)
-set(CMAKE_C_LINK_USING_feat "")
+set(CMAKE_C_LINK_LIBRARY_USING_feat_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat "")
 
 add_library(dep SHARED empty.c)
 
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature4-stderr.txt b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature4-stderr.txt
index 7385115..c074dd0 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature4-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature4-stderr.txt
@@ -1,5 +1,5 @@
 CMake Error at bad-feature4.cmake:[0-9]+ \(add_library\):
-  Feature 'feat', specified by variable 'CMAKE_C_LINK_USING_feat', is
+  Feature 'feat', specified by variable 'CMAKE_C_LINK_LIBRARY_USING_feat', is
   malformed \("<LIBRARY>", "<LIB_ITEM>", or "<LINK_ITEM>" patterns are
   missing\) and cannot be used to link target 'lib'.
 Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature4.cmake b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature4.cmake
index b40cfaf..6942f7c 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature4.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature4.cmake
@@ -1,7 +1,7 @@
 enable_language(C)
 
-set(CMAKE_C_LINK_USING_feat_SUPPORTED TRUE)
-set(CMAKE_C_LINK_USING_feat "-opt")
+set(CMAKE_C_LINK_LIBRARY_USING_feat_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat "-opt")
 
 add_library(dep SHARED empty.c)
 
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature5-stderr.txt b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature5-stderr.txt
index 9894577..6604307 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature5-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature5-stderr.txt
@@ -1,5 +1,5 @@
 CMake Error at bad-feature5.cmake:[0-9]+ \(add_library\):
-  Feature 'feat', specified by variable 'CMAKE_C_LINK_USING_feat', is
+  Feature 'feat', specified by variable 'CMAKE_C_LINK_LIBRARY_USING_feat', is
   malformed \(wrong number of elements\) and cannot be used to link target
   'lib'.
 Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature5.cmake b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature5.cmake
index 8ce1ecf..d0a827a 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature5.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature5.cmake
@@ -1,7 +1,7 @@
 enable_language(C)
 
-set(CMAKE_C_LINK_USING_feat_SUPPORTED TRUE)
-set(CMAKE_C_LINK_USING_feat "-prefix" "<LIBRARY>")
+set(CMAKE_C_LINK_LIBRARY_USING_feat_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat "-prefix" "<LIBRARY>")
 
 add_library(dep SHARED empty.c)
 
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature6-stderr.txt b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature6-stderr.txt
index d8d0e19..9de4ffa 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature6-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature6-stderr.txt
@@ -1,5 +1,5 @@
 CMake Error at bad-feature6.cmake:[0-9]+ \(add_library\):
-  Feature 'feat', specified by variable 'CMAKE_C_LINK_USING_feat', is
+  Feature 'feat', specified by variable 'CMAKE_C_LINK_LIBRARY_USING_feat', is
   malformed \("<LIBRARY>", "<LIB_ITEM>", or "<LINK_ITEM>" patterns are missing
   for "PATH{}" alternative\) and cannot be used to link target 'lib'.
 Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature6.cmake b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature6.cmake
index 7b72ad5..04a50f8 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature6.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature6.cmake
@@ -1,7 +1,7 @@
 enable_language(C)
 
-set(CMAKE_C_LINK_USING_feat_SUPPORTED TRUE)
-set(CMAKE_C_LINK_USING_feat "PATH{}NAME{<LIBRARY>}")
+set(CMAKE_C_LINK_LIBRARY_USING_feat_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat "PATH{}NAME{<LIBRARY>}")
 
 add_library(dep SHARED empty.c)
 
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature7-stderr.txt b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature7-stderr.txt
index 2a498cd..9ea9936 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature7-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature7-stderr.txt
@@ -1,5 +1,5 @@
 CMake Error at bad-feature7.cmake:[0-9]+ \(add_library\):
-  Feature 'feat', specified by variable 'CMAKE_C_LINK_USING_feat', is
+  Feature 'feat', specified by variable 'CMAKE_C_LINK_LIBRARY_USING_feat', is
   malformed \("<LIBRARY>", "<LIB_ITEM>", or "<LINK_ITEM>" patterns are missing
   for "NAME{}" alternative\) and cannot be used to link target 'lib'.
 Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature7.cmake b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature7.cmake
index 173f86c..9659811 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature7.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/bad-feature7.cmake
@@ -1,7 +1,7 @@
 enable_language(C)
 
-set(CMAKE_C_LINK_USING_feat_SUPPORTED TRUE)
-set(CMAKE_C_LINK_USING_feat "NAME{}PATH{<LIBRARY>}")
+set(CMAKE_C_LINK_LIBRARY_USING_feat_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat "NAME{}PATH{<LIBRARY>}")
 
 add_library(dep SHARED empty.c)
 
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/compatible-features.cmake b/Tests/RunCMake/GenEx-LINK_LIBRARY/compatible-features.cmake
index 2579a5f..fb88e36 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/compatible-features.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/compatible-features.cmake
@@ -1,10 +1,10 @@
 enable_language(C)
 
-set(CMAKE_C_LINK_USING_feat1_SUPPORTED TRUE)
-set(CMAKE_C_LINK_USING_feat1 "<LIBRARY>")
+set(CMAKE_C_LINK_LIBRARY_USING_feat1_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat1 "<LIBRARY>")
 
-set(CMAKE_C_LINK_USING_feat2_SUPPORTED TRUE)
-set(CMAKE_C_LINK_USING_feat2 "<LIBRARY>")
+set(CMAKE_C_LINK_LIBRARY_USING_feat2_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat2 "<LIBRARY>")
 
 add_library(dep1 SHARED empty.c)
 
@@ -15,7 +15,7 @@ add_library(dep3 SHARED empty.c)
 target_link_libraries(dep3 PUBLIC dep2)
 
 add_library(lib1 SHARED empty.c)
-target_link_libraries(lib1 PRIVATE $<LINK_LIBRARY:feat2,dep1,dep2>)
+target_link_libraries(lib1 PRIVATE "$<LINK_LIBRARY:feat2,dep1,dep2>")
 
 add_library(lib2 SHARED empty.c)
-target_link_libraries(lib2 PRIVATE $<LINK_LIBRARY:DEFAULT,dep2,dep3>)
+target_link_libraries(lib2 PRIVATE "$<LINK_LIBRARY:DEFAULT,dep2,dep3>")
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/feature-not-supported.cmake b/Tests/RunCMake/GenEx-LINK_LIBRARY/feature-not-supported.cmake
index 0666227..0d952c2 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/feature-not-supported.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/feature-not-supported.cmake
@@ -1,7 +1,7 @@
 enable_language(C)
 
-set(CMAKE_C_LINK_USING_feat_SUPPORTED FALSE)
-set(CMAKE_C_LINK_USING_feat "<LIBRARY>")
+set(CMAKE_C_LINK_LIBRARY_USING_feat_SUPPORTED FALSE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat "<LIBRARY>")
 
 add_library(dep SHARED empty.c)
 
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/incompatible-features1.cmake b/Tests/RunCMake/GenEx-LINK_LIBRARY/incompatible-features1.cmake
index d96b214..c230c4f 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/incompatible-features1.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/incompatible-features1.cmake
@@ -1,10 +1,10 @@
 enable_language(C)
 
-set(CMAKE_C_LINK_USING_feat1_SUPPORTED TRUE)
-set(CMAKE_C_LINK_USING_feat1 "<LIBRARY>")
+set(CMAKE_C_LINK_LIBRARY_USING_feat1_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat1 "<LIBRARY>")
 
-set(CMAKE_C_LINK_USING_feat2_SUPPORTED TRUE)
-set(CMAKE_C_LINK_USING_feat2 "<LIBRARY>")
+set(CMAKE_C_LINK_LIBRARY_USING_feat2_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat2 "<LIBRARY>")
 
 add_library(dep1 SHARED empty.c)
 
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/incompatible-features2.cmake b/Tests/RunCMake/GenEx-LINK_LIBRARY/incompatible-features2.cmake
index 1845fdb..d204ebd 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/incompatible-features2.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/incompatible-features2.cmake
@@ -1,10 +1,10 @@
 enable_language(C)
 
-set(CMAKE_C_LINK_USING_feat1_SUPPORTED TRUE)
-set(CMAKE_C_LINK_USING_feat1 "<LIBRARY>")
+set(CMAKE_C_LINK_LIBRARY_USING_feat1_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat1 "<LIBRARY>")
 
-set(CMAKE_C_LINK_USING_feat2_SUPPORTED TRUE)
-set(CMAKE_C_LINK_USING_feat2 "<LIBRARY>")
+set(CMAKE_C_LINK_LIBRARY_USING_feat2_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat2 "<LIBRARY>")
 
 add_library(dep1 SHARED empty.c)
 
@@ -12,4 +12,4 @@ add_library(dep2 SHARED empty.c)
 target_link_libraries(dep2 PUBLIC dep1)
 
 add_library(lib SHARED empty.c)
-target_link_libraries(lib PRIVATE $<LINK_LIBRARY:feat2,dep1,dep2>)
+target_link_libraries(lib PRIVATE "$<LINK_LIBRARY:feat2,dep1,dep2>")
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/incompatible-features3.cmake b/Tests/RunCMake/GenEx-LINK_LIBRARY/incompatible-features3.cmake
index 1198d91..bf79e11 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/incompatible-features3.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/incompatible-features3.cmake
@@ -1,15 +1,15 @@
 enable_language(C)
 
-set(CMAKE_C_LINK_USING_feat1_SUPPORTED TRUE)
-set(CMAKE_C_LINK_USING_feat1 "<LIBRARY>")
+set(CMAKE_C_LINK_LIBRARY_USING_feat1_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat1 "<LIBRARY>")
 
-set(CMAKE_C_LINK_USING_feat2_SUPPORTED TRUE)
-set(CMAKE_C_LINK_USING_feat2 "<LIBRARY>")
+set(CMAKE_C_LINK_LIBRARY_USING_feat2_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat2 "<LIBRARY>")
 
 add_library(dep1 SHARED empty.c)
 
 add_library(dep2 SHARED empty.c)
-target_link_libraries(dep2 PUBLIC $<LINK_LIBRARY:feat1,dep1>)
+target_link_libraries(dep2 PUBLIC "$<LINK_LIBRARY:feat1,dep1>")
 
 add_library(lib SHARED empty.c)
 target_link_libraries(lib PRIVATE dep1 dep2)
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/library-ignored.cmake b/Tests/RunCMake/GenEx-LINK_LIBRARY/library-ignored.cmake
index e000b97..a888bb8 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/library-ignored.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/library-ignored.cmake
@@ -1,7 +1,7 @@
 enable_language(C)
 
-set(CMAKE_C_LINK_USING_feat_SUPPORTED TRUE)
-set(CMAKE_C_LINK_USING_feat "<LIBRARY>")
+set(CMAKE_C_LINK_LIBRARY_USING_feat_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat "<LIBRARY>")
 
 add_library(dep OBJECT empty.c)
 
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/nested-compatible-features.cmake b/Tests/RunCMake/GenEx-LINK_LIBRARY/nested-compatible-features.cmake
index d3b04e8..561aa09 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/nested-compatible-features.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/nested-compatible-features.cmake
@@ -1,7 +1,7 @@
 enable_language(C)
 
-set(CMAKE_C_LINK_USING_feat1_SUPPORTED TRUE)
-set(CMAKE_C_LINK_USING_feat1 "<LIBRARY>")
+set(CMAKE_C_LINK_LIBRARY_USING_feat1_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat1 "<LIBRARY>")
 
 add_library(dep1 SHARED empty.c)
 
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/nested-incompatible-features.cmake b/Tests/RunCMake/GenEx-LINK_LIBRARY/nested-incompatible-features.cmake
index 8565fa9..746638e 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/nested-incompatible-features.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/nested-incompatible-features.cmake
@@ -1,10 +1,10 @@
 enable_language(C)
 
-set(CMAKE_C_LINK_USING_feat1_SUPPORTED TRUE)
-set(CMAKE_C_LINK_USING_feat1 "<LIBRARY>")
+set(CMAKE_C_LINK_LIBRARY_USING_feat1_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat1 "<LIBRARY>")
 
-set(CMAKE_C_LINK_USING_feat2_SUPPORTED TRUE)
-set(CMAKE_C_LINK_USING_feat2 "<LIBRARY>")
+set(CMAKE_C_LINK_LIBRARY_USING_feat2_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat2 "<LIBRARY>")
 
 add_library(dep1 SHARED empty.c)
 
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/only-targets.cmake b/Tests/RunCMake/GenEx-LINK_LIBRARY/only-targets.cmake
index e29ad6c..8cec0c3 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/only-targets.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/only-targets.cmake
@@ -1,7 +1,7 @@
 enable_language(C)
 
-set(CMAKE_C_LINK_USING_feat1_SUPPORTED TRUE)
-set(CMAKE_C_LINK_USING_feat1 "<LIBRARY>")
+set(CMAKE_C_LINK_LIBRARY_USING_feat1_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat1 "<LIBRARY>")
 
 set(CMAKE_LINK_LIBRARIES_ONLY_TARGETS 1)
 
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/override-features3.cmake b/Tests/RunCMake/GenEx-LINK_LIBRARY/override-features3.cmake
index 7f010fd..a1437e6 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/override-features3.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/override-features3.cmake
@@ -1,7 +1,7 @@
 
 include(incompatible-features1.cmake)
 
-set(CMAKE_C_LINK_USING_feat3_SUPPORTED TRUE)
-set(CMAKE_C_LINK_USING_feat3 "<LIBRARY>")
+set(CMAKE_C_LINK_LIBRARY_USING_feat3_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat3 "<LIBRARY>")
 
 set_property(TARGET lib PROPERTY LINK_LIBRARY_OVERRIDE "feat3,dep1")
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/override-features4.cmake b/Tests/RunCMake/GenEx-LINK_LIBRARY/override-features4.cmake
index 405cc8a..f34f745 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/override-features4.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/override-features4.cmake
@@ -2,8 +2,8 @@
 include(incompatible-features1.cmake)
 
 
-set(CMAKE_C_LINK_USING_feat3_SUPPORTED TRUE)
-set(CMAKE_C_LINK_USING_feat3 "<LIBRARY>")
+set(CMAKE_C_LINK_LIBRARY_USING_feat3_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat3 "<LIBRARY>")
 
 set_property(TARGET lib PROPERTY LINK_LIBRARY_OVERRIDE "feat3,dep1")
 set_property(TARGET lib PROPERTY LINK_LIBRARY_OVERRIDE_dep1 feat1)
diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/target_link_options.cmake b/Tests/RunCMake/GenEx-LINK_LIBRARY/target_link_options.cmake
index 800124c..a989a53 100644
--- a/Tests/RunCMake/GenEx-LINK_LIBRARY/target_link_options.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/target_link_options.cmake
@@ -1,4 +1,4 @@
 enable_language(C)
 
 add_library(empty SHARED empty.c)
-target_link_options(empty PRIVATE $<LINK_LIBRARY:FEAT>)
+target_link_options(empty PRIVATE "$<LINK_LIBRARY:FEAT>")
diff --git a/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/LINK_LIBRARY.cmake b/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/LINK_LIBRARY.cmake
index ced689e..1581611 100644
--- a/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/LINK_LIBRARY.cmake
+++ b/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/LINK_LIBRARY.cmake
@@ -12,28 +12,28 @@ endif()
 add_library(base1 SHARED base.c)
 add_library(base2 SHARED base.c)
 
-set(CMAKE_C_LINK_USING_feat1 "--LIBFLAG<LIBRARY>")
-set(CMAKE_C_LINK_USING_feat1_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat1 "--LIBFLAG<LIBRARY>")
+set(CMAKE_C_LINK_LIBRARY_USING_feat1_SUPPORTED TRUE)
 
-set(CMAKE_C_LINK_USING_feat1_1 "--LIBFLAG_C<LIBRARY>")
-set(CMAKE_C_LINK_USING_feat1_1_SUPPORTED FALSE)
-set(CMAKE_LINK_USING_feat1_1 "--LIBFLAG<LIBRARY>")
-set(CMAKE_LINK_USING_feat1_1_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat1_1 "--LIBFLAG_C<LIBRARY>")
+set(CMAKE_C_LINK_LIBRARY_USING_feat1_1_SUPPORTED FALSE)
+set(CMAKE_LINK_LIBRARY_USING_feat1_1 "--LIBFLAG<LIBRARY>")
+set(CMAKE_LINK_LIBRARY_USING_feat1_1_SUPPORTED TRUE)
 
-set(CMAKE_C_LINK_USING_feat2 "--PREFIXGROUP" "--LIBGROUP<LIBRARY>" "--SUFFIXGROUP")
-set(CMAKE_C_LINK_USING_feat2_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat2 "--PREFIXGROUP" "--LIBGROUP<LIBRARY>" "--SUFFIXGROUP")
+set(CMAKE_C_LINK_LIBRARY_USING_feat2_SUPPORTED TRUE)
 
-set(CMAKE_C_LINK_USING_feat3 "--PREFIXGROUP" "<LINK_ITEM>" "--SUFFIXGROUP")
-set(CMAKE_C_LINK_USING_feat3_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat3 "--PREFIXGROUP" "<LINK_ITEM>" "--SUFFIXGROUP")
+set(CMAKE_C_LINK_LIBRARY_USING_feat3_SUPPORTED TRUE)
 
-set(CMAKE_C_LINK_USING_feat4 "--PREFIXGROUP" "--LIBFLAG<LIBRARY> --ITEMFLAG<LIB_ITEM>" "--SUFFIXGROUP")
-set(CMAKE_C_LINK_USING_feat4_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat4 "--PREFIXGROUP" "--LIBFLAG<LIBRARY> --ITEMFLAG<LIB_ITEM>" "--SUFFIXGROUP")
+set(CMAKE_C_LINK_LIBRARY_USING_feat4_SUPPORTED TRUE)
 
-set(CMAKE_C_LINK_USING_feat5 "--PREFIXGROUP" "PATH{--LIBFLAG<LIBRARY>}NAME{--ITEMFLAG<LIB_ITEM>}" "--SUFFIXGROUP")
-set(CMAKE_C_LINK_USING_feat5_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat5 "--PREFIXGROUP" "PATH{--LIBFLAG<LIBRARY>}NAME{--ITEMFLAG<LIB_ITEM>}" "--SUFFIXGROUP")
+set(CMAKE_C_LINK_LIBRARY_USING_feat5_SUPPORTED TRUE)
 
-set(CMAKE_C_LINK_USING_feat6 "<LINK_ITEM>")
-set(CMAKE_C_LINK_USING_feat6_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_feat6 "<LINK_ITEM>")
+set(CMAKE_C_LINK_LIBRARY_USING_feat6_SUPPORTED TRUE)
 
 
 add_library(LinkLibrary_simple1 SHARED lib.c)
@@ -77,28 +77,28 @@ target_link_libraries(LinkLibrary_mix_features2 PRIVATE "$<LINK_LIBRARY:feat2,ba
 
 target_link_libraries(base3 INTERFACE other1)
 add_library(LinkLibrary_mix_features3 SHARED lib.c)
-target_link_libraries(LinkLibrary_mix_features3 PRIVATE base2 $<LINK_LIBRARY:feat2,base1,base3> other2)
+target_link_libraries(LinkLibrary_mix_features3 PRIVATE base2 "$<LINK_LIBRARY:feat2,base1,base3>" other2)
 
 # testing LINK_LIBRARY_OVERRIDE property
 add_library(LinkLibrary_override_features1 SHARED lib.c)
-target_link_libraries(LinkLibrary_override_features1 PRIVATE $<LINK_LIBRARY:feat1,base1,base3>)
+target_link_libraries(LinkLibrary_override_features1 PRIVATE "$<LINK_LIBRARY:feat1,base1,base3>")
 set_property(TARGET LinkLibrary_override_features1 PROPERTY LINK_LIBRARY_OVERRIDE "feat1,base1")
 
 add_library(LinkLibrary_override_features2 SHARED lib.c)
-target_link_libraries(LinkLibrary_override_features2 PRIVATE $<LINK_LIBRARY:feat1,base1,base3>)
+target_link_libraries(LinkLibrary_override_features2 PRIVATE "$<LINK_LIBRARY:feat1,base1,base3>")
 set_property(TARGET LinkLibrary_override_features2 PROPERTY LINK_LIBRARY_OVERRIDE "feat2,base1,other1")
 
 add_library(LinkLibrary_override_with_default SHARED lib.c)
-target_link_libraries(LinkLibrary_override_with_default PRIVATE $<LINK_LIBRARY:feat1,base1,base3>)
+target_link_libraries(LinkLibrary_override_with_default PRIVATE "$<LINK_LIBRARY:feat1,base1,base3>")
 set_property(TARGET LinkLibrary_override_with_default PROPERTY LINK_LIBRARY_OVERRIDE "$<$<LINK_LANGUAGE:C>:DEFAULT,base1,other1>")
 
 # testing LINK_LIBRARY_OVERRIDE_<LIBRARY> property
 add_library(LinkLibrary_override_features3 SHARED lib.c)
-target_link_libraries(LinkLibrary_override_features3 PRIVATE $<LINK_LIBRARY:feat1,base1,base3>)
+target_link_libraries(LinkLibrary_override_features3 PRIVATE "$<LINK_LIBRARY:feat1,base1,base3>")
 set_property(TARGET LinkLibrary_override_features3 PROPERTY LINK_LIBRARY_OVERRIDE_base1 feat1)
 
 add_library(LinkLibrary_override_features4 SHARED lib.c)
-target_link_libraries(LinkLibrary_override_features4 PRIVATE $<LINK_LIBRARY:feat1,base1,base3>)
+target_link_libraries(LinkLibrary_override_features4 PRIVATE "$<LINK_LIBRARY:feat1,base1,base3>")
 set_property(TARGET LinkLibrary_override_features4 PROPERTY LINK_LIBRARY_OVERRIDE "feat3,base1,other1")
 set_property(TARGET LinkLibrary_override_features4 PROPERTY LINK_LIBRARY_OVERRIDE_base1 feat2)
 set_property(TARGET LinkLibrary_override_features4 PROPERTY LINK_LIBRARY_OVERRIDE_other1 feat2)
diff --git a/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/imported-target-stdout.txt b/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/imported-target-stdout.txt
index b3a86cc..981376a 100644
--- a/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/imported-target-stdout.txt
+++ b/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/imported-target-stdout.txt
@@ -4,8 +4,8 @@ CMake Warning \(dev\) at imported-target.cmake:[0-9]+ \(add_library\):
   unsupported.
 
   Did you miss to define it by setting variables
-  "CMAKE_C_LINK_USING_whole_archive" and
-  "CMAKE_C_LINK_USING_whole_archive_SUPPORTED"\?
+  "CMAKE_C_LINK_LIBRARY_USING_whole_archive" and
+  "CMAKE_C_LINK_LIBRARY_USING_whole_archive_SUPPORTED"\?
 Call Stack \(most recent call first\):
   CMakeLists.txt:[0-9]+ \(include\)
 This warning is for project developers.  Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/weak_library.cmake b/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/weak_library.cmake
index 135326e..45b4f66 100644
--- a/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/weak_library.cmake
+++ b/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/weak_library.cmake
@@ -2,11 +2,11 @@
 enable_language(C)
 
 if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
-  set(CMAKE_LINK_USING_weak_library "PATH{-weak_library <LIBRARY>}NAME{LINKER:-weak-l<LIB_ITEM>}")
-  set(CMAKE_LINK_USING_weak_library_SUPPORTED TRUE)
+  set(CMAKE_LINK_LIBRARY_USING_weak_library "PATH{-weak_library <LIBRARY>}NAME{LINKER:-weak-l<LIB_ITEM>}")
+  set(CMAKE_LINK_LIBRARY_USING_weak_library_SUPPORTED TRUE)
 else()
   # feature not yet supported for the other environments
-  set(CMAKE_LINK_USING_whole_library_SUPPORTED FALSE)
+  set(CMAKE_LINK_LIBRARY_USING_whole_library_SUPPORTED FALSE)
 endif()
 
 add_library(lib SHARED base.c lib.c unref.c)
diff --git a/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/whole_archive.cmake b/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/whole_archive.cmake
index 5214565..93082a4 100644
--- a/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/whole_archive.cmake
+++ b/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/whole_archive.cmake
@@ -1,27 +1,27 @@
 
 enable_language(C)
 
-set(CMAKE_C_LINK_USING_whole_archive_SUPPORTED TRUE)
+set(CMAKE_C_LINK_LIBRARY_USING_whole_archive_SUPPORTED TRUE)
 if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
-  set(CMAKE_C_LINK_USING_whole_archive "-force_load <LIB_ITEM>")
+  set(CMAKE_C_LINK_LIBRARY_USING_whole_archive "-force_load <LIB_ITEM>")
 elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
   execute_process(COMMAND "${CMAKE_LINKER}" --help
                           OUTPUT_VARIABLE linker_help
                           ERROR_VARIABLE linker_help)
   if(linker_help MATCHES "--push-state" AND linker_help MATCHES "--pop-state")
-    set(CMAKE_C_LINK_USING_whole_archive "LINKER:--push-state,--whole-archive"
-                                         "<LINK_ITEM>"
-                                         "LINKER:--pop-state")
+    set(CMAKE_C_LINK_LIBRARY_USING_whole_archive "LINKER:--push-state,--whole-archive"
+                                                 "<LINK_ITEM>"
+                                                 "LINKER:--pop-state")
   else()
-    set(CMAKE_C_LINK_USING_whole_archive "LINKER:--whole-archive"
-                                         "<LINK_ITEM>"
-                                         "LINKER:--no-whole-archive")
+    set(CMAKE_C_LINK_LIBRARY_USING_whole_archive "LINKER:--whole-archive"
+                                                 "<LINK_ITEM>"
+                                                 "LINKER:--no-whole-archive")
   endif()
 elseif(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
-  set(CMAKE_C_LINK_USING_whole_archive "/WHOLEARCHIVE:<LIBRARY>")
+  set(CMAKE_C_LINK_LIBRARY_USING_whole_archive "/WHOLEARCHIVE:<LIBRARY>")
 else()
   # feature not yet supported for the other environments
-  set(CMAKE_C_LINK_USING_whole_archive_SUPPORTED FALSE)
+  set(CMAKE_C_LINK_LIBRARY_USING_whole_archive_SUPPORTED FALSE)
 endif()
 
 add_library(base STATIC base.c unref.c)