[cmake-developers] [PATCH 1/4] Use GetCFBundleDirectory within GetFullNameInternal

Gregor Jasny gjasny at googlemail.com
Tue Dec 16 16:22:07 EST 2014


Replace duplicated code by call to GetCFBundleDirectory.

Signed-off-by: Gregor Jasny <gjasny at googlemail.com>
---
 Source/cmTarget.cxx | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index f0957d0..90295c8 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4056,15 +4056,8 @@ void cmTarget::GetFullNameInternal(const std::string& config,
 
   if(this->IsCFBundleOnApple())
     {
-    fw_prefix = this->GetOutputName(config, false);
-    fw_prefix += ".";
-    const char *ext = this->GetProperty("BUNDLE_EXTENSION");
-    if (!ext)
-      {
-      ext = "bundle";
-      }
-    fw_prefix += ext;
-    fw_prefix += "/Contents/MacOS/";
+    fw_prefix = this->GetCFBundleDirectory(config, false);
+    fw_prefix += "/";
     targetPrefix = fw_prefix.c_str();
     targetSuffix = 0;
     }
-- 
1.9.3 (Apple Git-50)



More information about the cmake-developers mailing list