summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalGenerator.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2007-05-08 15:53:39 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2007-05-08 15:53:39 (GMT)
commit39ccc4fb11b52a3dbc18d50e19003cd9a708f623 (patch)
treefb24c43b02cc15129c9e33fbf8ed5a8e25bc8e6e /Source/cmLocalGenerator.cxx
parente6b8aa496a224c92770cb9a7f1cb733f137a611d (diff)
downloadCMake-39ccc4fb11b52a3dbc18d50e19003cd9a708f623.zip
CMake-39ccc4fb11b52a3dbc18d50e19003cd9a708f623.tar.gz
CMake-39ccc4fb11b52a3dbc18d50e19003cd9a708f623.tar.bz2
ENH: fix it so that the FRAMEWORK property does not break the building of normal shared libs on non-mac platforms
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r--Source/cmLocalGenerator.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 7479871..05ba04d 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1728,7 +1728,12 @@ void cmLocalGenerator
// off the per-configuration subdirectory. The link directory
// ordering knows how to deal with this.
linkItem += tgt->GetDirectory(0, implib);
+ // on apple if the FRAMEWORK prop is set, then
+ // do not add the target full name but just use the directory
+ // name
+#ifdef __APPLE__
if(!tgt->GetPropertyAsBool("FRAMEWORK"))
+#endif
{
linkItem += "/";
linkItem += tgt->GetFullName(config, implib);