[Cmake-commits] CMake branch, master, updated. v3.14.0-rc3-275-g451d390
Kitware Robot
kwrobot at kitware.com
Tue Mar 5 09:13:08 EST 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 451d3907fdb0eea70f1107712324300d786433d7 (commit)
via 168c11f70e52f9b4f00ef289a95023be3f273d2d (commit)
via aa68ce6bd43356fb5ebb77a3e9eadd3bbef5bed9 (commit)
via bb97a377dd15819357937b4644baa8848d22a990 (commit)
from 4b3a73980011344740f804ddda31cdde35a397b8 (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=451d3907fdb0eea70f1107712324300d786433d7
commit 451d3907fdb0eea70f1107712324300d786433d7
Merge: 168c11f aa68ce6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 5 14:04:17 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Mar 5 09:04:46 2019 -0500
Merge topic 'restore_broken_curses_gui'
aa68ce6bd4 ccmake: fix curses dialog broken by refactoring
Acked-by: Kitware Robot <kwrobot at kitware.com>
Acked-by: Artur Ryt <artur.ryt at gmail.com>
Merge-request: !3055
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=168c11f70e52f9b4f00ef289a95023be3f273d2d
commit 168c11f70e52f9b4f00ef289a95023be3f273d2d
Merge: 4b3a739 bb97a37
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 5 14:03:56 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Mar 5 09:04:06 2019 -0500
Merge topic 'fix_autorcc_for_qt6'
bb97a377dd Autogen: Fallback on internal qrc parser when RCC isn't built yet
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3049
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa68ce6bd43356fb5ebb77a3e9eadd3bbef5bed9
commit aa68ce6bd43356fb5ebb77a3e9eadd3bbef5bed9
Author: Felix Schwitzer <flx107809 at gmail.com>
AuthorDate: Sun Mar 3 18:37:50 2019 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 4 09:12:41 2019 -0500
ccmake: fix curses dialog broken by refactoring
During refactoring in commit f6291eee25 (cmCursesMainForm: Modernize
with STL and ranged-for loops, 2019-02-10) a transformation of a loop
went wrong and editing the cmake cache with ccmake no longer works.
Make ccmake work again.
Fixes: #19008
diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx
index 906dd02..028e852 100644
--- a/Source/CursesDialog/cmCursesMainForm.cxx
+++ b/Source/CursesDialog/cmCursesMainForm.cxx
@@ -669,7 +669,7 @@ void cmCursesMainForm::FillCacheManagerFromUI()
this->CMakeInstance->GetState()->GetCacheEntryValue(cacheKey);
if (existingValue) {
std::string oldValue = existingValue;
- std::string newValue = entry->GetValue();
+ std::string newValue = entry->Entry->GetValue();
std::string fixedOldValue;
std::string fixedNewValue;
cmStateEnums::CacheEntryType t =
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb97a377dd15819357937b4644baa8848d22a990
commit bb97a377dd15819357937b4644baa8848d22a990
Author: Alexandru Croitor <alexandru.croitor at qt.io>
AuthorDate: Fri Mar 1 17:38:39 2019 +0100
Commit: Alexandru Croitor <alexandru.croitor at qt.io>
CommitDate: Mon Mar 4 12:45:16 2019 +0100
Autogen: Fallback on internal qrc parser when RCC isn't built yet
When building a Qt project, the AUTORCC functionality, by default,
uses the rcc binary to get the contents of a qrc file for
dependency information. This is done at CMake "generate" time.
The problem is that while configuring Qt itself, the rcc binary is
not built yet.
In that case, to get the contents of the qrc file, fall back to
the code branch which uses an ifstream instead of the rcc binary.
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx
index 2fb6fdf..ef8fe73 100644
--- a/Source/cmQtAutoGenInitializer.cxx
+++ b/Source/cmQtAutoGenInitializer.cxx
@@ -594,7 +594,7 @@ bool cmQtAutoGenInitializer::InitRcc()
if (this->QtVersion.Major == 5 || this->QtVersion.Major == 6) {
if (stdOut.find("--list") != std::string::npos) {
this->Rcc.ListOptions.emplace_back("--list");
- } else {
+ } else if (stdOut.find("-list") != std::string::npos) {
this->Rcc.ListOptions.emplace_back("-list");
}
}
@@ -1581,6 +1581,10 @@ bool cmQtAutoGenInitializer::GetQtExecutable(GenVarsT& genVars,
print_err(prop + " evaluates to an empty value");
return false;
}
+
+ // Check if the provided executable already exists (it's possible for it
+ // not to exist when building Qt itself).
+ genVars.ExecutableExists = cmSystemTools::FileExists(genVars.Executable);
return true;
}
}
@@ -1630,6 +1634,7 @@ bool cmQtAutoGenInitializer::GetQtExecutable(GenVarsT& genVars,
print_err(err);
return false;
}
+ genVars.ExecutableExists = true;
}
return true;
@@ -1648,7 +1653,7 @@ bool cmQtAutoGenInitializer::RccListInputs(std::string const& fileName,
error += "\n";
return false;
}
- if (!this->Rcc.ListOptions.empty()) {
+ if (this->Rcc.ExecutableExists && !this->Rcc.ListOptions.empty()) {
// Use rcc for file listing
if (this->Rcc.Executable.empty()) {
error = "rcc executable not available";
diff --git a/Source/cmQtAutoGenInitializer.h b/Source/cmQtAutoGenInitializer.h
index 700f16b..1f4087f 100644
--- a/Source/cmQtAutoGenInitializer.h
+++ b/Source/cmQtAutoGenInitializer.h
@@ -68,6 +68,7 @@ public:
std::string ExecutableTargetName;
cmGeneratorTarget* ExecutableTarget = nullptr;
std::string Executable;
+ bool ExecutableExists = false;
/// @brief Constructor
GenVarsT(GenT gen, std::string const& genName,
-----------------------------------------------------------------------
Summary of changes:
Source/CursesDialog/cmCursesMainForm.cxx | 2 +-
Source/cmQtAutoGenInitializer.cxx | 9 +++++++--
Source/cmQtAutoGenInitializer.h | 1 +
3 files changed, 9 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list