diff options
| author | Robert Maynard <robert.maynard@kitware.com> | 2020-03-27 13:03:44 (GMT) |
|---|---|---|
| committer | Robert Maynard <robert.maynard@kitware.com> | 2020-04-06 16:12:14 (GMT) |
| commit | f867423aa214e3145fe4e6775eb9634c340df02b (patch) | |
| tree | 86ec75c2752ddcf02c12d36b6aef23271b6d3ab5 /Source/cmRuntimeDependencyArchive.cxx | |
| parent | 888b8a43d82e6f6157642c2bd84520920d8e2d11 (diff) | |
| download | CMake-f867423aa214e3145fe4e6775eb9634c340df02b.zip CMake-f867423aa214e3145fe4e6775eb9634c340df02b.tar.gz CMake-f867423aa214e3145fe4e6775eb9634c340df02b.tar.bz2 | |
file: GetRuntimeDependencies use CMAKE_OBJDUMP when applicable
On machines where the gnu bin utils are prefixed, or suffixed
the file(GET_RUNTIME_DEPENDENCIES ) command would fail without
explicitly setting the location of objdump.
Now we pre-populate the variables used to find objdump based
on the gnu bin utils, so that these use cases are better supported
Diffstat (limited to 'Source/cmRuntimeDependencyArchive.cxx')
| -rw-r--r-- | Source/cmRuntimeDependencyArchive.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmRuntimeDependencyArchive.cxx b/Source/cmRuntimeDependencyArchive.cxx index 34b3105..0781d29 100644 --- a/Source/cmRuntimeDependencyArchive.cxx +++ b/Source/cmRuntimeDependencyArchive.cxx @@ -218,6 +218,9 @@ bool cmRuntimeDependencyArchive::GetGetRuntimeDependenciesCommand( // First see if it was supplied by the user std::string toolCommand = this->GetMakefile()->GetSafeDefinition( "CMAKE_GET_RUNTIME_DEPENDENCIES_COMMAND"); + if (toolCommand.empty() && search == "objdump") { + toolCommand = this->GetMakefile()->GetSafeDefinition("CMAKE_OBJDUMP"); + } if (!toolCommand.empty()) { cmExpandList(toolCommand, command); return true; |