diff options
| author | David Cole <david.cole@kitware.com> | 2012-03-02 16:47:21 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-03-02 16:47:21 (GMT) |
| commit | 6ed36e7b880cc4c0581afb58dc381daa2b9e1d99 (patch) | |
| tree | e6703195f80bd0812da0b1679d013640e9b046dc /Source | |
| parent | b930798042412bf0db7fff8ab4d41ad6f48642f5 (diff) | |
| parent | 4f6fd961da510d9a2b6144e48272c68101376f0f (diff) | |
| download | CMake-6ed36e7b880cc4c0581afb58dc381daa2b9e1d99.zip CMake-6ed36e7b880cc4c0581afb58dc381daa2b9e1d99.tar.gz CMake-6ed36e7b880cc4c0581afb58dc381daa2b9e1d99.tar.bz2 | |
Merge topic 'simplify-GetRealDependency'
4f6fd96 Drop if(...) check because condition is always true
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index ffbeb48..501fe61 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1902,15 +1902,8 @@ bool cmLocalGenerator::GetRealDependency(const char* inName, case cmTarget::SHARED_LIBRARY: case cmTarget::MODULE_LIBRARY: case cmTarget::UNKNOWN_LIBRARY: - { - // Get the location of the target's output file and depend on it. - if(const char* location = target->GetLocation(config)) - { - dep = location; - return true; - } - } - break; + dep = target->GetLocation(config); + return true; case cmTarget::UTILITY: case cmTarget::GLOBAL_TARGET: // A utility target has no file on which to depend. This was listed |