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 09fe6e6e9408dde14193f9a358550ac738581cac (commit)
via 3cf89d18c3f3f2e0fc7478ccd1c483382cdf0a3d (commit)
via ac7ac46fce54ce263dc32cdd12775a12a95814b7 (commit)
via dad7868db812addec83c96c50df106d851d6257b (commit)
via 955ebe1c93a35503bf3c81f25c41e481aa94f439 (commit)
via c81a86ee6d69bbae9f0213765aabc434faf10080 (commit)
via 83368b4dd539f287942e26e53ed49d4ec3a18db0 (commit)
via fd58bb83e6a6dcbe27afd2272d1a9c2722de2482 (commit)
via 800c3ab2e0b5eed54221ac37c634938ca3d273ab (commit)
via 627fc5b44f7c5fab2d6bc81ae3a0d9b06cb9f3bf (commit)
via 7d98cd0442d695df809378dcd5a1eb0c3fb0928a (commit)
via 93af8a2583e2ec8d067a2e8eda544dfc5d3d3b4f (commit)
via 4053d5737d917c3cb34af5d510a65ca26ed1763e (commit)
from cb8863279033d9dd81d01edcbb5cc8ae1911b06c (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=09fe6e6e9408dde14193f9a358550ac738581cac
commit 09fe6e6e9408dde14193f9a358550ac738581cac
Merge: 3cf89d1 c81a86e
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jul 31 15:47:28 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jul 31 11:49:23 2019 -0400
Merge topic 'ninja-1.10'
c81a86ee6d Ninja: Record dyndep support by Ninja 1.10
83368b4dd5 Ninja: Drop unused dyndep version check
fd58bb83e6 Ninja: Use in-class initialization of global generator members
Acked-by: Kitware Robot <kwro...@kitware.com>
Acked-by: Ben Boeckel <ben.boec...@kitware.com>
Merge-request: !3256
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cf89d18c3f3f2e0fc7478ccd1c483382cdf0a3d
commit 3cf89d18c3f3f2e0fc7478ccd1c483382cdf0a3d
Merge: ac7ac46 627fc5b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jul 31 15:46:10 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jul 31 11:47:09 2019 -0400
Merge topic 'ExternalProject-avoid-extra-checkout'
627fc5b44f ExternalProject: Avoid unnecessary checkout on clone
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3626
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac7ac46fce54ce263dc32cdd12775a12a95814b7
commit ac7ac46fce54ce263dc32cdd12775a12a95814b7
Merge: dad7868 800c3ab
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jul 31 15:45:29 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jul 31 11:45:38 2019 -0400
Merge topic 'FindPythonInterp-no-version-verify'
800c3ab2e0 FindPythonInterp: Document lack of version filtering for plain
`python`
Acked-by: Kitware Robot <kwro...@kitware.com>
Acked-by: Rolf Eike Beer <e...@sf-mail.de>
Merge-request: !3631
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dad7868db812addec83c96c50df106d851d6257b
commit dad7868db812addec83c96c50df106d851d6257b
Merge: 955ebe1 7d98cd0
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jul 31 11:43:52 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jul 31 11:43:52 2019 -0400
Merge branch 'release-3.15'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=955ebe1c93a35503bf3c81f25c41e481aa94f439
commit 955ebe1c93a35503bf3c81f25c41e481aa94f439
Merge: cb88632 93af8a2
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jul 31 15:42:11 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jul 31 11:43:17 2019 -0400
Merge topic 'source_group-tree-files'
93af8a2583 source_group: Fix regression in relative FILES
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3630
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c81a86ee6d69bbae9f0213765aabc434faf10080
commit c81a86ee6d69bbae9f0213765aabc434faf10080
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jul 30 13:53:44 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jul 30 13:53:44 2019 -0400
Ninja: Record dyndep support by Ninja 1.10
Upstream Ninja 1.10 and above support the `dyndep` feature we need
for Fortran.
diff --git a/Source/cmGlobalNinjaGenerator.cxx
b/Source/cmGlobalNinjaGenerator.cxx
index 4656d03..0b68966 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -548,7 +548,11 @@ void cmGlobalNinjaGenerator::CheckNinjaFeatures()
this->NinjaSupportsMultilineDepfile = !cmSystemTools::VersionCompare(
cmSystemTools::OP_LESS, this->NinjaVersion.c_str(),
RequiredNinjaVersionForMultilineDepfile().c_str());
- {
+ this->NinjaSupportsDyndeps = !cmSystemTools::VersionCompare(
+ cmSystemTools::OP_LESS, this->NinjaVersion.c_str(),
+ RequiredNinjaVersionForDyndeps().c_str());
+ if (!this->NinjaSupportsDyndeps) {
+ // The ninja version number is not new enough to have upstream support.
// Our ninja branch adds ".dyndep-#" to its version number,
// where '#' is a feature-specific version number. Extract it.
static std::string const k_DYNDEP_ = ".dyndep-";
@@ -586,9 +590,10 @@ bool cmGlobalNinjaGenerator::CheckFortran(cmMakefile* mf)
const
"The Ninja generator does not support Fortran using Ninja version\n"
" " + this->NinjaVersion + "\n"
"due to lack of required features. "
- "Kitware has implemented the required features but as of this version "
- "of CMake they have not been integrated to upstream ninja. "
- "Pending integration, Kitware maintains a branch at:\n"
+ "Kitware has implemented the required features and they have been "
+ "merged to upstream ninja for inclusion in Ninja 1.10 and higher. "
+ "As of this version of CMake, Ninja 1.10 has not been released. "
+ "Meanwhile, Kitware maintains a branch of Ninja at:\n"
" https://github.com/Kitware/ninja/tree/features-for-fortran#readme\n";
"with the required features. "
"One may build ninja from that branch to get support for Fortran."
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index c752bab..db64031 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -322,6 +322,7 @@ public:
{
return "1.9";
}
+ static std::string RequiredNinjaVersionForDyndeps() { return "1.10"; }
bool SupportsConsolePool() const;
bool SupportsImplicitOuts() const;
bool SupportsManifestRestat() const;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83368b4dd539f287942e26e53ed49d4ec3a18db0
commit 83368b4dd539f287942e26e53ed49d4ec3a18db0
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jul 30 13:53:41 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jul 30 13:53:41 2019 -0400
Ninja: Drop unused dyndep version check
Our dyndep support version 1 has been merged to upstream Ninja.
We never developed a second dyndep version, so simply drop our
checks for different versions.
diff --git a/Source/cmGlobalNinjaGenerator.cxx
b/Source/cmGlobalNinjaGenerator.cxx
index 87c55bf..4656d03 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -555,7 +555,11 @@ void cmGlobalNinjaGenerator::CheckNinjaFeatures()
std::string::size_type pos = this->NinjaVersion.find(k_DYNDEP_);
if (pos != std::string::npos) {
const char* fv = &this->NinjaVersion[pos + k_DYNDEP_.size()];
- cmSystemTools::StringToULong(fv, &this->NinjaSupportsDyndeps);
+ unsigned long dyndep = 0;
+ cmSystemTools::StringToULong(fv, &dyndep);
+ if (dyndep == 1) {
+ this->NinjaSupportsDyndeps = true;
+ }
}
}
}
@@ -572,37 +576,24 @@ bool cmGlobalNinjaGenerator::CheckLanguages(
bool cmGlobalNinjaGenerator::CheckFortran(cmMakefile* mf) const
{
- if (this->NinjaSupportsDyndeps == 1) {
+ if (this->NinjaSupportsDyndeps) {
return true;
}
std::ostringstream e;
- if (this->NinjaSupportsDyndeps == 0) {
- /* clang-format off */
- e <<
- "The Ninja generator does not support Fortran using Ninja version\n"
- " " + this->NinjaVersion + "\n"
- "due to lack of required features. "
- "Kitware has implemented the required features but as of this version "
- "of CMake they have not been integrated to upstream ninja. "
- "Pending integration, Kitware maintains a branch at:\n"
- " https://github.com/Kitware/ninja/tree/features-for-fortran#readme\n";
- "with the required features. "
- "One may build ninja from that branch to get support for Fortran."
- ;
- /* clang-format on */
- } else {
- /* clang-format off */
- e <<
- "The Ninja generator in this version of CMake does not support Fortran "
- "using Ninja version\n"
- " " + this->NinjaVersion + "\n"
- "because its 'dyndep' feature version is " <<
- this->NinjaSupportsDyndeps << ". "
- "This version of CMake is aware only of 'dyndep' feature version 1."
- ;
- /* clang-format on */
- }
+ /* clang-format off */
+ e <<
+ "The Ninja generator does not support Fortran using Ninja version\n"
+ " " + this->NinjaVersion + "\n"
+ "due to lack of required features. "
+ "Kitware has implemented the required features but as of this version "
+ "of CMake they have not been integrated to upstream ninja. "
+ "Pending integration, Kitware maintains a branch at:\n"
+ " https://github.com/Kitware/ninja/tree/features-for-fortran#readme\n";
+ "with the required features. "
+ "One may build ninja from that branch to get support for Fortran."
+ ;
+ /* clang-format on */
mf->IssueMessage(MessageType::FATAL_ERROR, e.str());
cmSystemTools::SetFatalErrorOccured();
return false;
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 9ca7480..c752bab 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -439,7 +439,7 @@ private:
bool NinjaSupportsImplicitOuts = false;
bool NinjaSupportsManifestRestat = false;
bool NinjaSupportsMultilineDepfile = false;
- unsigned long NinjaSupportsDyndeps = 0;
+ bool NinjaSupportsDyndeps = false;
private:
void InitOutputPathPrefix();
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd58bb83e6a6dcbe27afd2272d1a9c2722de2482
commit fd58bb83e6a6dcbe27afd2272d1a9c2722de2482
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jul 30 13:53:34 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jul 30 13:53:34 2019 -0400
Ninja: Use in-class initialization of global generator members
diff --git a/Source/cmGlobalNinjaGenerator.cxx
b/Source/cmGlobalNinjaGenerator.cxx
index bad715d..87c55bf 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -415,14 +415,6 @@ void cmGlobalNinjaGenerator::WriteDefault(std::ostream& os,
cmGlobalNinjaGenerator::cmGlobalNinjaGenerator(cmake* cm)
: cmGlobalCommonGenerator(cm)
- , UsingGCCOnWindows(false)
- , ComputingUnknownDependencies(false)
- , PolicyCMP0058(cmPolicies::WARN)
- , NinjaSupportsConsolePool(false)
- , NinjaSupportsImplicitOuts(false)
- , NinjaSupportsManifestRestat(false)
- , NinjaSupportsMultilineDepfile(false)
- , NinjaSupportsDyndeps(0)
{
#ifdef _WIN32
cm->GetState()->SetWindowsShell(true);
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 99afc1d..9ca7480 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -402,7 +402,7 @@ private:
/// The set of dependencies to add to the "all" target.
cmNinjaDeps AllDependencies;
- bool UsingGCCOnWindows;
+ bool UsingGCCOnWindows = false;
/// The set of custom commands we have seen.
std::set<cmCustomCommand const*> CustomCommands;
@@ -412,8 +412,8 @@ private:
/// Whether we are collecting known build outputs and needed
/// dependencies to determine unknown dependencies.
- bool ComputingUnknownDependencies;
- cmPolicies::PolicyStatus PolicyCMP0058;
+ bool ComputingUnknownDependencies = false;
+ cmPolicies::PolicyStatus PolicyCMP0058 = cmPolicies::WARN;
/// The combined explicit dependencies of custom build commands
std::set<std::string> CombinedCustomCommandExplicitDependencies;
@@ -435,11 +435,11 @@ private:
std::string NinjaCommand;
std::string NinjaVersion;
- bool NinjaSupportsConsolePool;
- bool NinjaSupportsImplicitOuts;
- bool NinjaSupportsManifestRestat;
- bool NinjaSupportsMultilineDepfile;
- unsigned long NinjaSupportsDyndeps;
+ bool NinjaSupportsConsolePool = false;
+ bool NinjaSupportsImplicitOuts = false;
+ bool NinjaSupportsManifestRestat = false;
+ bool NinjaSupportsMultilineDepfile = false;
+ unsigned long NinjaSupportsDyndeps = 0;
private:
void InitOutputPathPrefix();
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=800c3ab2e0b5eed54221ac37c634938ca3d273ab
commit 800c3ab2e0b5eed54221ac37c634938ca3d273ab
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jul 30 12:07:37 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jul 30 12:09:43 2019 -0400
FindPythonInterp: Document lack of version filtering for plain `python`
Also drop the `CMakeOnly.MajorVersionSelection-PythonInterp_2` test
because some environments now have a plain `python` executable for
Python 3.
Fixes: #19536
diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
index da33301..ccc7d5b 100644
--- a/Modules/FindPythonInterp.cmake
+++ b/Modules/FindPythonInterp.cmake
@@ -39,6 +39,15 @@ If calling both ``find_package(PythonInterp)`` and
``find_package(PythonLibs)``, call ``find_package(PythonInterp)`` first to
get the currently active Python version by default with a consistent version
of PYTHON_LIBRARIES.
+
+.. note::
+
+ A call to ``find_package(PythonInterp ${V})`` for python version ``V``
+ may find a ``python`` executable with no version suffix. In this case
+ no attempt is made to avoid python executables from other versions.
+ Use :module:`FindPython3`, :module:`FindPython2` or :module:`FindPython`
+ instead.
+
#]=======================================================================]
unset(_Python_NAMES)
diff --git a/Tests/CMakeOnly/CMakeLists.txt b/Tests/CMakeOnly/CMakeLists.txt
index 1aeab8b..19f3f79 100644
--- a/Tests/CMakeOnly/CMakeLists.txt
+++ b/Tests/CMakeOnly/CMakeLists.txt
@@ -84,5 +84,5 @@ function(add_major_test module)
endfunction()
add_major_test(PythonLibs VERSIONS 2 3 VERSION_VAR PYTHONLIBS_VERSION_STRING)
-add_major_test(PythonInterp NOLANG VERSIONS 2 3 VERSION_VAR
PYTHON_VERSION_STRING)
+add_major_test(PythonInterp NOLANG VERSIONS 3 VERSION_VAR
PYTHON_VERSION_STRING)
add_major_test(Qt VERSIONS 3 4 VERSION_VAR QT_VERSION_STRING)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=627fc5b44f7c5fab2d6bc81ae3a0d9b06cb9f3bf
commit 627fc5b44f7c5fab2d6bc81ae3a0d9b06cb9f3bf
Author: Tetragramm <gaussgun+git...@gmail.com>
AuthorDate: Mon Jul 29 18:17:49 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jul 30 11:45:33 2019 -0400
ExternalProject: Avoid unnecessary checkout on clone
The clone step checks out the cloned branch but is always followed by an
explicit checkout of the desired `GIT_TAG`. Tell `git clone` not to
check out.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 14fc231..e55ed46 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1079,7 +1079,7 @@ function(_ep_write_gitclone_script script_filename
source_dir git_EXECUTABLE git
message(FATAL_ERROR "Tag for git checkout should not be empty.")
endif()
- set(git_clone_options)
+ set(git_clone_options "--no-checkout")
if(git_shallow)
if(NOT GIT_VERSION_STRING VERSION_LESS 1.7.10)
list(APPEND git_clone_options "--depth 1 --no-single-branch")
-----------------------------------------------------------------------
Summary of changes:
Modules/ExternalProject.cmake | 2 +-
Modules/FindPythonInterp.cmake | 9 ++++++
Source/cmGlobalNinjaGenerator.cxx | 62 ++++++++++++++++-----------------------
Source/cmGlobalNinjaGenerator.h | 17 ++++++-----
Source/cmSourceGroupCommand.cxx | 15 +++-------
Tests/CMakeOnly/CMakeLists.txt | 2 +-
6 files changed, 49 insertions(+), 58 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
