diff options
author | Brad King <brad.king@kitware.com> | 2009-01-20 20:49:37 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2009-01-20 20:49:37 (GMT) |
commit | acb0e8fb8569c4d0abe9d98de72e86b07d83771d (patch) | |
tree | 9b5890e01345c380991745c65dbf5a174e774ef0 /Source/cmExportBuildFileGenerator.cxx | |
parent | 2c81e5fb5cd592e9450250364e6667082014f0b7 (diff) | |
download | CMake-acb0e8fb8569c4d0abe9d98de72e86b07d83771d.zip CMake-acb0e8fb8569c4d0abe9d98de72e86b07d83771d.tar.gz CMake-acb0e8fb8569c4d0abe9d98de72e86b07d83771d.tar.bz2 |
BUG: Fix LOCATION property for Mac AppBundles
Previously cmTarget::GetLocation and cmTarget::GetFullPath would return
for Mac AppBundles the top-level bundle directory but without the .app
extension. We worked around this at the call sites. This fixes the
methods and removes the work-arounds. See issue #8406.
Diffstat (limited to 'Source/cmExportBuildFileGenerator.cxx')
-rw-r--r-- | Source/cmExportBuildFileGenerator.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx index 429bb53..f1c0685 100644 --- a/Source/cmExportBuildFileGenerator.cxx +++ b/Source/cmExportBuildFileGenerator.cxx @@ -106,16 +106,10 @@ cmExportBuildFileGenerator std::string prop = "IMPORTED_LOCATION"; prop += suffix; std::string value; - if(target->IsFrameworkOnApple()) + if(target->IsFrameworkOnApple() || target->IsAppBundleOnApple()) { value = target->GetFullPath(config, false); } - else if(target->IsAppBundleOnApple()) - { - value = target->GetFullPath(config, false); - value += ".app/Contents/MacOS/"; - value += target->GetFullName(config, false); - } else { value = target->GetFullPath(config, false, true); |