[Cmake-commits] CMake branch, master, updated. v3.14.1-688-ga593243
Kitware Robot
kwrobot at kitware.com
Fri Apr 12 07:33:09 EDT 2019
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, master has been updated
via a5932438cd71a8ef4a7480d9e2e86f70bbf571d5 (commit)
via 680641a882254d3b8c6eb52415e7be841a46a6eb (commit)
via 12ef832c96a7aa222f28353d5b9b33dd015d9f53 (commit)
via 428c1e429ffb320b64c19d3da32e0822ff1b1b8d (commit)
via b4385d5ccc0241f8adcb012ad645d3696bcc544c (commit)
from 1601b47b3e55e5de755412ced342a5bb75c4507a (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=a5932438cd71a8ef4a7480d9e2e86f70bbf571d5
commit a5932438cd71a8ef4a7480d9e2e86f70bbf571d5
Merge: 680641a 12ef832
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 12 11:29:11 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Apr 12 07:29:20 2019 -0400
Merge topic 'fix-overlay-icon-windows'
12ef832c96 cmake-gui: Fix icon overlay on windows
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3217
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=680641a882254d3b8c6eb52415e7be841a46a6eb
commit 680641a882254d3b8c6eb52415e7be841a46a6eb
Merge: 1601b47 428c1e4
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 12 11:23:24 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Apr 12 07:23:31 2019 -0400
Merge topic 'xcode-extra-sources'
428c1e429f Xcode: Avoid mutating App Bundle targets during generation
b4385d5ccc Xcode: Factor out duplicate source group code into lambda
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3208
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12ef832c96a7aa222f28353d5b9b33dd015d9f53
commit 12ef832c96a7aa222f28353d5b9b33dd015d9f53
Author: Julien Jomier <julien.jomier at kitware.com>
AuthorDate: Thu Apr 11 19:50:25 2019 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 11 14:03:29 2019 -0400
cmake-gui: Fix icon overlay on windows
Since commit 9175a378f5 (QtDialog: Add windows taskbar progress,
2018-11-17, v3.14.0-rc1~330^2) we've added a missing overlay icon.
This results in Windows falling back to a default overlay icon.
Simply drop this line.
Fixes: #19160
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx
index 72cce9f..5f6ccca 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -303,7 +303,6 @@ void CMakeSetupDialog::initialize()
#ifdef QT_WINEXTRAS
this->TaskbarButton = new QWinTaskbarButton(this);
this->TaskbarButton->setWindow(this->windowHandle());
- this->TaskbarButton->setOverlayIcon(QIcon(":/loading.png"));
#endif
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=428c1e429ffb320b64c19d3da32e0822ff1b1b8d
commit 428c1e429ffb320b64c19d3da32e0822ff1b1b8d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 10 08:04:15 2019 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 11 10:35:14 2019 -0400
Xcode: Avoid mutating App Bundle targets during generation
For `MACOSX_BUNDLE` targets we generate an `Info.plist` automatically
and add it to the sources presented to Xcode. Avoid mutating the
original target's list of sources to achieve this. Otherwise when we
generate the same target again (e.g. in a sub-project's Xcode file) it
will look different than the first time and possibly break invariants.
Fixes: #19114
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index dd6008f..57de60e 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1142,6 +1142,13 @@ bool cmGlobalXCodeGenerator::CreateXCodeTarget(
// Add CMakeLists.txt file for user convenience.
this->AddXCodeProjBuildRule(gtgt, classes);
+ // Add the Info.plist we are about to generate for an App Bundle.
+ if (gtgt->GetPropertyAsBool("MACOSX_BUNDLE")) {
+ std::string plist = this->ComputeInfoPListLocation(gtgt);
+ cmSourceFile* sf = gtgt->Makefile->GetOrCreateSource(plist, true);
+ classes.push_back(sf);
+ }
+
std::sort(classes.begin(), classes.end(), cmSourceFilePathCompare());
gtgt->ComputeObjectMapping();
@@ -2883,14 +2890,6 @@ bool cmGlobalXCodeGenerator::CreateGroups(
this->GroupMap[key] = pbxgroup;
};
- // add the soon to be generated Info.plist file as a source for a
- // MACOSX_BUNDLE file
- if (gtgt->GetPropertyAsBool("MACOSX_BUNDLE")) {
- std::string plist = this->ComputeInfoPListLocation(gtgt);
- mf->GetOrCreateSource(plist, true);
- gtgt->AddSource(plist);
- }
-
// Put cmSourceFile instances in proper groups:
for (auto const& si : gtgt->GetAllConfigSources()) {
cmSourceFile const* sf = si.Source;
@@ -2909,6 +2908,13 @@ bool cmGlobalXCodeGenerator::CreateGroups(
cmSourceFile* sf = gtgt->Makefile->GetOrCreateSource(listfile);
addSourceToGroup(sf->GetFullPath());
}
+
+ // Add the Info.plist we are about to generate for an App Bundle.
+ if (gtgt->GetPropertyAsBool("MACOSX_BUNDLE")) {
+ std::string plist = this->ComputeInfoPListLocation(gtgt);
+ cmSourceFile* sf = gtgt->Makefile->GetOrCreateSource(plist, true);
+ addSourceToGroup(sf->GetFullPath());
+ }
}
}
return true;
diff --git a/Tests/BundleTest/BundleSubDir/CMakeLists.txt b/Tests/BundleTest/BundleSubDir/CMakeLists.txt
index 43c366a..2f7f2c4 100644
--- a/Tests/BundleTest/BundleSubDir/CMakeLists.txt
+++ b/Tests/BundleTest/BundleSubDir/CMakeLists.txt
@@ -1,3 +1,5 @@
+project(BundleSubDir)
+
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/randomResourceFile.plist"
COMMAND /bin/cp
@@ -34,3 +36,8 @@ install(TARGETS SecondBundle DESTINATION Applications)
# bundle does not respect the name. Also the executable will not be found by
# the test driver if this does not work.
set_target_properties(SecondBundle PROPERTIES OUTPUT_NAME SecondBundleExe)
+
+# Express one app bundle in terms of another's SOURCES to verify that
+# the generators do not expose the Info.plist of one to the other.
+add_executable(SubdirBundle1 MACOSX_BUNDLE EXCLUDE_FROM_ALL ../BundleTest.cxx)
+add_executable(SubdirBundle2 MACOSX_BUNDLE EXCLUDE_FROM_ALL $<TARGET_PROPERTY:SubdirBundle1,SOURCES>)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4385d5ccc0241f8adcb012ad645d3696bcc544c
commit b4385d5ccc0241f8adcb012ad645d3696bcc544c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 10 07:59:37 2019 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 11 10:35:14 2019 -0400
Xcode: Factor out duplicate source group code into lambda
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 51c001e..dd6008f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2875,6 +2875,14 @@ bool cmGlobalXCodeGenerator::CreateGroups(
continue;
}
+ auto addSourceToGroup = [this, mf, gtgt,
+ &sourceGroups](std::string const& source) {
+ cmSourceGroup* sourceGroup = mf->FindSourceGroup(source, sourceGroups);
+ cmXCodeObject* pbxgroup = this->CreateOrGetPBXGroup(gtgt, sourceGroup);
+ std::string key = GetGroupMapKeyFromPath(gtgt, source);
+ this->GroupMap[key] = pbxgroup;
+ };
+
// add the soon to be generated Info.plist file as a source for a
// MACOSX_BUNDLE file
if (gtgt->GetPropertyAsBool("MACOSX_BUNDLE")) {
@@ -2890,12 +2898,7 @@ bool cmGlobalXCodeGenerator::CreateGroups(
// Object library files go on the link line instead.
continue;
}
- // Add the file to the list of sources.
- std::string const& source = sf->GetFullPath();
- cmSourceGroup* sourceGroup = mf->FindSourceGroup(source, sourceGroups);
- cmXCodeObject* pbxgroup = this->CreateOrGetPBXGroup(gtgt, sourceGroup);
- std::string key = GetGroupMapKeyFromPath(gtgt, source);
- this->GroupMap[key] = pbxgroup;
+ addSourceToGroup(sf->GetFullPath());
}
// Add CMakeLists.txt file for user convenience.
@@ -2904,11 +2907,7 @@ bool cmGlobalXCodeGenerator::CreateGroups(
gtgt->GetLocalGenerator()->GetCurrentSourceDirectory();
listfile += "/CMakeLists.txt";
cmSourceFile* sf = gtgt->Makefile->GetOrCreateSource(listfile);
- std::string const& source = sf->GetFullPath();
- cmSourceGroup* sourceGroup = mf->FindSourceGroup(source, sourceGroups);
- cmXCodeObject* pbxgroup = this->CreateOrGetPBXGroup(gtgt, sourceGroup);
- std::string key = GetGroupMapKeyFromPath(gtgt, source);
- this->GroupMap[key] = pbxgroup;
+ addSourceToGroup(sf->GetFullPath());
}
}
}
-----------------------------------------------------------------------
Summary of changes:
Source/QtDialog/CMakeSetupDialog.cxx | 1 -
Source/cmGlobalXCodeGenerator.cxx | 41 ++++++++++++++++------------
Tests/BundleTest/BundleSubDir/CMakeLists.txt | 7 +++++
3 files changed, 30 insertions(+), 19 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list