summaryrefslogtreecommitdiffstats
path: root/Source/cmTarget.cxx
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2007-08-01 17:04:45 (GMT)
committerDavid Cole <david.cole@kitware.com>2007-08-01 17:04:45 (GMT)
commitee91e2549921075b02f0a88fb48323b1c015228c (patch)
treee4189d3f1043bfc292981ceff2e7bf00bbf548ea /Source/cmTarget.cxx
parenta0533be267e0304b3a13f17c3adc660e8a830f71 (diff)
downloadCMake-ee91e2549921075b02f0a88fb48323b1c015228c.zip
CMake-ee91e2549921075b02f0a88fb48323b1c015228c.tar.gz
CMake-ee91e2549921075b02f0a88fb48323b1c015228c.tar.bz2
BUG: Only pay attention to the FRAMEWORK target property for SHARED library targets
Diffstat (limited to 'Source/cmTarget.cxx')
-rw-r--r--Source/cmTarget.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 1ca187d..c4b6e34 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1790,7 +1790,8 @@ void cmTarget::NormalGetFullNameInternal(TargetType type,
}
#if defined(__APPLE__)
// frameworks do not have a prefix or a suffix
- if(this->GetPropertyAsBool("FRAMEWORK"))
+ if (this->GetType() == cmTarget::SHARED_LIBRARY &&
+ this->GetPropertyAsBool("FRAMEWORK"))
{
targetPrefix = 0;
targetSuffix = 0;
@@ -2322,7 +2323,8 @@ const char* cmTarget::GetOutputDir(bool implib)
#if defined(__APPLE__)
// frameworks do not have a prefix or a suffix
- if(this->GetPropertyAsBool("FRAMEWORK"))
+ if (this->GetType() == cmTarget::SHARED_LIBRARY &&
+ this->GetPropertyAsBool("FRAMEWORK"))
{
out += "/";
out += this->GetFullName(0, implib);