Commit c042c998 authored by Brad King's avatar Brad King

Merge branch 'install-no-imported-global' into release-3.14

Merge-request: !3071
parents 898d21eb 47389c56
......@@ -402,7 +402,11 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
cmTarget* target = this->Makefile->FindLocalNonAliasTarget(tgt);
if (!target) {
// If no local target has been found, find it in the global scope.
target = this->Makefile->GetGlobalGenerator()->FindTarget(tgt, true);
cmTarget* const global_target =
this->Makefile->GetGlobalGenerator()->FindTarget(tgt, true);
if (global_target && !global_target->IsImported()) {
target = global_target;
}
}
if (target) {
// Found the target. Check its type.
......
......@@ -66,6 +66,7 @@ run_cmake(CMP0062-WARN)
run_cmake(CMP0087-OLD)
run_cmake(CMP0087-NEW)
run_cmake(CMP0087-WARN)
run_cmake(TARGETS-ImportedGlobal)
run_cmake(TARGETS-NAMELINK_COMPONENT-bad-all)
run_cmake(TARGETS-NAMELINK_COMPONENT-bad-exc)
run_cmake(FILES-DESTINATION-TYPE)
......
^CMake Error at TARGETS-ImportedGlobal.cmake:[0-9]+ \(install\):
install TARGETS given target "imported_global" which does not exist.
Call Stack \(most recent call first\):
CMakeLists.txt:[0-9]+ \(include\)$
add_library(imported_global STATIC IMPORTED GLOBAL)
set_property(TARGET imported_global PROPERTY IMPORTED_LOCATION /does_not_exist)
install(TARGETS imported_global DESTINATION bin)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment