diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-08 12:32:40 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-03-08 07:32:48 -0500 |
| commit | c2a3a945a5d57dd6630ec0a51434f6e3bdc0e274 (patch) | |
| tree | 403c94efd444e52f08732110ef270da850ba755e | |
| parent | b7a861647ec5584e23d3730edddf18ad45a2e465 (diff) | |
| parent | 47389c5641b821813f3f236bfbc179f52a2c95d7 (diff) | |
| download | cmake-c2a3a945a5d57dd6630ec0a51434f6e3bdc0e274.tar.gz | |
Merge topic 'install-no-imported-global'
47389c5641 install: Do not crash on imported global target
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3071
| -rw-r--r-- | Source/cmInstallCommand.cxx | 6 | ||||
| -rw-r--r-- | Tests/RunCMake/install/RunCMakeTest.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/install/TARGETS-ImportedGlobal-result.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/install/TARGETS-ImportedGlobal-stderr.txt | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/install/TARGETS-ImportedGlobal.cmake | 3 |
5 files changed, 14 insertions, 1 deletions
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index 8ef644141b..20d1a31340 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -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. diff --git a/Tests/RunCMake/install/RunCMakeTest.cmake b/Tests/RunCMake/install/RunCMakeTest.cmake index 28e8ec4d7d..c637db151a 100644 --- a/Tests/RunCMake/install/RunCMakeTest.cmake +++ b/Tests/RunCMake/install/RunCMakeTest.cmake @@ -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) diff --git a/Tests/RunCMake/install/TARGETS-ImportedGlobal-result.txt b/Tests/RunCMake/install/TARGETS-ImportedGlobal-result.txt new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/Tests/RunCMake/install/TARGETS-ImportedGlobal-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/install/TARGETS-ImportedGlobal-stderr.txt b/Tests/RunCMake/install/TARGETS-ImportedGlobal-stderr.txt new file mode 100644 index 0000000000..d67802bb56 --- /dev/null +++ b/Tests/RunCMake/install/TARGETS-ImportedGlobal-stderr.txt @@ -0,0 +1,4 @@ +^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\)$ diff --git a/Tests/RunCMake/install/TARGETS-ImportedGlobal.cmake b/Tests/RunCMake/install/TARGETS-ImportedGlobal.cmake new file mode 100644 index 0000000000..08c20bd4ec --- /dev/null +++ b/Tests/RunCMake/install/TARGETS-ImportedGlobal.cmake @@ -0,0 +1,3 @@ +add_library(imported_global STATIC IMPORTED GLOBAL) +set_property(TARGET imported_global PROPERTY IMPORTED_LOCATION /does_not_exist) +install(TARGETS imported_global DESTINATION bin) |