diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-08-04 17:19:46 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-08-05 16:20:47 (GMT) |
| commit | 8d2de00244f8338664c16bd8d8ebb03c6f0cb83f (patch) | |
| tree | fe846ed5d566ec5ba77ab8b250d01e1498231a9f /Source/cmGlobalUnixMakefileGenerator3.cxx | |
| parent | 3df705681be123d93146156fec3166b41b19465a (diff) | |
| download | CMake-8d2de00244f8338664c16bd8d8ebb03c6f0cb83f.zip CMake-8d2de00244f8338664c16bd8d8ebb03c6f0cb83f.tar.gz CMake-8d2de00244f8338664c16bd8d8ebb03c6f0cb83f.tar.bz2 | |
cmGeneratorTarget: Move NeedRelinkBeforeInstall from cmTarget.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index edf2705..69747a4 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -482,7 +482,7 @@ cmGlobalUnixMakefileGenerator3 // Add this to the list of depends rules in this directory. if((!check_all || !gtarget->GetPropertyAsBool("EXCLUDE_FROM_ALL")) && (!check_relink || - gtarget->Target + gtarget ->NeedRelinkBeforeInstall(lg->GetConfigName()))) { std::string tname = lg->GetRelativeTargetDirectory(*gtarget->Target); @@ -691,7 +691,7 @@ cmGlobalUnixMakefileGenerator3 // Add a local name for the rule to relink the target before // installation. - if(gtarget->Target + if(gtarget ->NeedRelinkBeforeInstall(lg->GetConfigName())) { makeTargetName = lg->GetRelativeTargetDirectory(*gtarget->Target); @@ -876,7 +876,7 @@ cmGlobalUnixMakefileGenerator3 name, depends, commands, true); // Add rules to prepare the target for installation. - if(gtarget->Target + if(gtarget ->NeedRelinkBeforeInstall(lg->GetConfigName())) { localName = lg->GetRelativeTargetDirectory(*gtarget->Target); |