diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-23 12:59:23 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-23 12:59:23 (GMT) |
| commit | f101d4eff3462acd90623ba801027d3e7b642fbd (patch) | |
| tree | d700d0c30d3be82772ae2f9d4ec7615a0b648803 | |
| parent | 46f49c918af040b92a63171388206adbb9a8b8bc (diff) | |
| parent | e36e5a2680f34c64773944b152e5337f8951a644 (diff) | |
| download | CMake-f101d4eff3462acd90623ba801027d3e7b642fbd.zip CMake-f101d4eff3462acd90623ba801027d3e7b642fbd.tar.gz CMake-f101d4eff3462acd90623ba801027d3e7b642fbd.tar.bz2 | |
Merge topic 'xcode-bundle-extension'
e36e5a26 Xcode: Properly handle BUNDLE_EXTENSION
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 5 | ||||
| -rw-r--r-- | Tests/CFBundleTest/CMakeLists.txt | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index d30830a..e82cb16 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -1801,6 +1801,11 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt, extraLinkOptions += " "; extraLinkOptions += createFlags; } + const char* ext = gtgt->GetProperty("BUNDLE_EXTENSION"); + if (ext) { + buildSettings->AddAttribute("WRAPPER_EXTENSION", + this->CreateString(ext)); + } std::string plist = this->ComputeInfoPListLocation(gtgt); // Xcode will create the final version of Info.plist at build time, // so let it replace the cfbundle name. This avoids creating diff --git a/Tests/CFBundleTest/CMakeLists.txt b/Tests/CFBundleTest/CMakeLists.txt index 5cda527..0fe6bb7 100644 --- a/Tests/CFBundleTest/CMakeLists.txt +++ b/Tests/CFBundleTest/CMakeLists.txt @@ -50,7 +50,6 @@ set_source_files_properties( set_target_properties(CFBundleTest PROPERTIES BUNDLE 1 BUNDLE_EXTENSION plugin - XCODE_ATTRIBUTE_WRAPPER_EXTENSION plugin #sets the extension to .plugin XCODE_ATTRIBUTE_MACH_O_TYPE mh_bundle XCODE_ATTRIBUTE_INFOPLIST_FILE ${CMAKE_CURRENT_BINARY_DIR}/Info.plist MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist |