[Cmake-commits] CMake branch, next, updated. v3.6.0-rc4-658-g53c8b78
Brad King
brad.king at kitware.com
Tue Jul 5 11:15:50 EDT 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 53c8b78e1687596fe5f871e4262a9382904ca4cc (commit)
via 8849bbfe1de702e4c8cf8163bce37fe3a560f808 (commit)
from b47b0a9c02550b01322fd7c2563e4e5b39f1e300 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53c8b78e1687596fe5f871e4262a9382904ca4cc
commit 53c8b78e1687596fe5f871e4262a9382904ca4cc
Merge: b47b0a9 8849bbf
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 5 11:15:49 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 5 11:15:49 2016 -0400
Merge topic 'app-framework-bundle-extension' into next
8849bbfe Revert topic 'app-framework-bundle-extension'
diff --cc Source/cmGeneratorTarget.cxx
index 793ad2e,9a025d9..c9cbd00
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@@ -3021,15 -3008,9 +3011,9 @@@ void cmGeneratorTarget::GetFullNameInte
std::string fw_prefix;
if (this->IsFrameworkOnApple()) {
fw_prefix = this->GetOutputName(config, false);
- fw_prefix += ".";
- const char* ext = this->GetProperty("BUNDLE_EXTENSION");
- if (!ext) {
- ext = "framework";
- }
- fw_prefix += ext;
- fw_prefix += "/";
+ fw_prefix += ".framework/";
targetPrefix = fw_prefix.c_str();
- targetSuffix = 0;
+ targetSuffix = CM_NULLPTR;
}
if (this->IsCFBundleOnApple()) {
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8849bbfe1de702e4c8cf8163bce37fe3a560f808
commit 8849bbfe1de702e4c8cf8163bce37fe3a560f808
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 5 11:14:29 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 5 11:14:39 2016 -0400
Revert topic 'app-framework-bundle-extension'
It will be revised and restored with tests.
diff --git a/Help/prop_tgt/BUNDLE_EXTENSION.rst b/Help/prop_tgt/BUNDLE_EXTENSION.rst
index 6b3d580..ea265b3 100644
--- a/Help/prop_tgt/BUNDLE_EXTENSION.rst
+++ b/Help/prop_tgt/BUNDLE_EXTENSION.rst
@@ -1,8 +1,7 @@
BUNDLE_EXTENSION
----------------
-The file extension used to name a :prop_tgt:`BUNDLE`, a :prop_tgt:`FRAMEWORK`,
-or a :prop_tgt:`MACOSX_BUNDLE` target on the OS X and iOS.
+The file extension used to name a :prop_tgt:`BUNDLE` target on the OS X and iOS.
-The default value is ``bundle``, ``framework``, or ``app`` for the respective
-target types.
+The default value is ``bundle`` - you can also use ``plugin`` or whatever
+file extension is required by the host app for your bundle.
diff --git a/Help/release/dev/app-framework-bundle-extension.rst b/Help/release/dev/app-framework-bundle-extension.rst
deleted file mode 100644
index 01855a2..0000000
--- a/Help/release/dev/app-framework-bundle-extension.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-app-framework-bundle-extension
-------------------------------
-
-* On Apple platforms the :prop_tgt:`BUNDLE_EXTENSION` now also applies to
- Frameworks and App Bundles.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index eec3422..9a025d9 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1346,12 +1346,7 @@ std::string cmGeneratorTarget::GetAppBundleDirectory(const std::string& config,
bool contentOnly) const
{
std::string fpath = this->GetFullName(config, false);
- fpath += ".";
- const char* ext = this->GetProperty("BUNDLE_EXTENSION");
- if (!ext) {
- ext = "app";
- }
- fpath += ext;
+ fpath += ".app";
if (!this->Makefile->PlatformIsAppleIos()) {
fpath += "/Contents";
if (!contentOnly) {
@@ -1396,12 +1391,7 @@ std::string cmGeneratorTarget::GetFrameworkDirectory(const std::string& config,
{
std::string fpath;
fpath += this->GetOutputName(config, false);
- fpath += ".";
- const char* ext = this->GetProperty("BUNDLE_EXTENSION");
- if (!ext) {
- ext = "framework";
- }
- fpath += ext;
+ fpath += ".framework";
if (!rootDir && !this->Makefile->PlatformIsAppleIos()) {
fpath += "/Versions/";
fpath += this->GetFrameworkVersion();
@@ -3018,13 +3008,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
std::string fw_prefix;
if (this->IsFrameworkOnApple()) {
fw_prefix = this->GetOutputName(config, false);
- fw_prefix += ".";
- const char* ext = this->GetProperty("BUNDLE_EXTENSION");
- if (!ext) {
- ext = "framework";
- }
- fw_prefix += ext;
- fw_prefix += "/";
+ fw_prefix += ".framework/";
targetPrefix = fw_prefix.c_str();
targetSuffix = 0;
}
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 91a90b2..e82cb16 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1843,11 +1843,6 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
std::string fw_version = gtgt->GetFrameworkVersion();
buildSettings->AddAttribute("FRAMEWORK_VERSION",
this->CreateString(fw_version));
- 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,
@@ -1882,11 +1877,6 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
// Handle bundles and normal executables separately.
if (gtgt->GetPropertyAsBool("MACOSX_BUNDLE")) {
- 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 executable name. This avoids creating
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index b1733ce..d56bb05 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -142,22 +142,13 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(
if (this->Target->IsAppBundleOnApple()) {
cmMakefile const* mf = this->Target->Target->GetMakefile();
- // Get App Bundle Extension
- const char* ext = this->Target->GetProperty("BUNDLE_EXTENSION");
- if (!ext) {
- ext = "app";
- }
-
// Install the whole app bundle directory.
type = cmInstallType_DIRECTORY;
literal_args += " USE_SOURCE_PERMISSIONS";
- from1 += ".";
- from1 += ext;
+ from1 += ".app";
// Tweaks apply to the binary inside the bundle.
- to1 += ".";
- to1 += ext;
- to1 += "/";
+ to1 += ".app/";
if (!mf->PlatformIsAppleIos()) {
to1 += "Contents/MacOS/";
}
-----------------------------------------------------------------------
Summary of changes:
Help/prop_tgt/BUNDLE_EXTENSION.rst | 7 +++----
.../release/dev/app-framework-bundle-extension.rst | 5 -----
Source/cmGeneratorTarget.cxx | 22 +++-----------------
Source/cmGlobalXCodeGenerator.cxx | 10 ---------
Source/cmInstallTargetGenerator.cxx | 13 ++----------
5 files changed, 8 insertions(+), 49 deletions(-)
delete mode 100644 Help/release/dev/app-framework-bundle-extension.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list