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 45e4f470c02b16622c281371d30ecc0f7d71e5c6 (commit)
via dfd2e0a4ede4a7c31eb7132f8e74d234b260a519 (commit)
via 22aabdfde0c3e73812b596c21479c8418075d644 (commit)
via f326591c1369680541311eabe8d3eae6d1bce293 (commit)
via f07d42632bd4f29eda871de12ebb5f03f9d4edda (commit)
via a38b63c1bb2485f43054906f2e9697f9a3979ce6 (commit)
via df6adb02c067a5714587365bc6ffdd90b342732c (commit)
via 5bf07b9cfc5fda0c9d81f90e34761eb256733785 (commit)
via b5ad572ac181c6e9754e31bd907abe59e7016d8a (commit)
via 62d6ed79fb4cc4cdeb1a246f0f12db7e6031f4ba (commit)
via 2b6f832bf52bf59241cd8de742bf95dbb4269c88 (commit)
from 76cb43c7c5515e0ca8c1858311a54954fbc39870 (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=45e4f470c02b16622c281371d30ecc0f7d71e5c6
commit 45e4f470c02b16622c281371d30ecc0f7d71e5c6
Merge: dfd2e0a f07d426
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue May 28 11:59:22 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue May 28 11:59:22 2019 -0400
Merge branch 'release-3.14'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dfd2e0a4ede4a7c31eb7132f8e74d234b260a519
commit dfd2e0a4ede4a7c31eb7132f8e74d234b260a519
Merge: 22aabdf a38b63c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue May 28 15:57:55 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue May 28 11:58:07 2019 -0400
Merge topic 'FindThreads-doc-c++'
a38b63c1bb FindThreads: Drop incorrect docs about usage with C++
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3391
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22aabdfde0c3e73812b596c21479c8418075d644
commit 22aabdfde0c3e73812b596c21479c8418075d644
Merge: f326591 df6adb0
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue May 28 15:56:14 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue May 28 11:56:24 2019 -0400
Merge topic 'cmake_automoc_relaxed_mode_deprecation'
df6adb02c0 Autogen: Deprecation release notes for CMAKE_AUTOMOC_RELAXED_MODE
5bf07b9cfc Help: Mark CMAKE_AUTOMOC_RELAXED_MODE as deprecated
b5ad572ac1 Autogen: Deprecation message for CMAKE_AUTOMOC_RELAXED_MODE
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3381
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f326591c1369680541311eabe8d3eae6d1bce293
commit f326591c1369680541311eabe8d3eae6d1bce293
Merge: 76cb43c 62d6ed7
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue May 28 15:51:19 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue May 28 11:53:21 2019 -0400
Merge topic 'FindPython-find_framework'
62d6ed79fb FindPython: Add variable 'Python_FIND_FRAMEWORK' to control
frameworks lookup.
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3374
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df6adb02c067a5714587365bc6ffdd90b342732c
commit df6adb02c067a5714587365bc6ffdd90b342732c
Author: Sebastian Holtermann <sebh...@xwmw.org>
AuthorDate: Mon May 27 12:55:34 2019 +0200
Commit: Sebastian Holtermann <sebh...@xwmw.org>
CommitDate: Mon May 27 13:13:08 2019 +0200
Autogen: Deprecation release notes for CMAKE_AUTOMOC_RELAXED_MODE
diff --git a/Help/release/dev/cmake_automoc_relaxed_mode.rst
b/Help/release/dev/cmake_automoc_relaxed_mode.rst
new file mode 100644
index 0000000..aa4772a
--- /dev/null
+++ b/Help/release/dev/cmake_automoc_relaxed_mode.rst
@@ -0,0 +1,5 @@
+cmake_automoc_relaxed_mode
+--------------------------
+
+* The variable :variable:`CMAKE_AUTOMOC_RELAXED_MODE` is considered
+ deprecated. Support still exists but will be removed in future versions.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5bf07b9cfc5fda0c9d81f90e34761eb256733785
commit 5bf07b9cfc5fda0c9d81f90e34761eb256733785
Author: Sebastian Holtermann <sebh...@xwmw.org>
AuthorDate: Mon May 27 12:56:58 2019 +0200
Commit: Sebastian Holtermann <sebh...@xwmw.org>
CommitDate: Mon May 27 13:13:08 2019 +0200
Help: Mark CMAKE_AUTOMOC_RELAXED_MODE as deprecated
diff --git a/Help/variable/CMAKE_AUTOMOC_RELAXED_MODE.rst
b/Help/variable/CMAKE_AUTOMOC_RELAXED_MODE.rst
index addc62d..6c0c61b 100644
--- a/Help/variable/CMAKE_AUTOMOC_RELAXED_MODE.rst
+++ b/Help/variable/CMAKE_AUTOMOC_RELAXED_MODE.rst
@@ -1,6 +1,8 @@
CMAKE_AUTOMOC_RELAXED_MODE
--------------------------
+.. deprecated:: 3.15
+
Switch between strict and relaxed automoc mode.
By default, :prop_tgt:`AUTOMOC` behaves exactly as described in the
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5ad572ac181c6e9754e31bd907abe59e7016d8a
commit b5ad572ac181c6e9754e31bd907abe59e7016d8a
Author: Sebastian Holtermann <sebh...@xwmw.org>
AuthorDate: Mon May 27 12:30:45 2019 +0200
Commit: Sebastian Holtermann <sebh...@xwmw.org>
CommitDate: Mon May 27 13:06:01 2019 +0200
Autogen: Deprecation message for CMAKE_AUTOMOC_RELAXED_MODE
`CMAKE_AUTOMOC_RELAXED_MODE` was added for backwards compatibility with KDE
4,
which had its last release in 2014. It does not offer additional features
but complicates the `AUTOMOC` code and dependency computation considerably.
Projects that use `CMAKE_AUTOMOC_RELAXED_MODE` functionality always got
extensive warnings during builds and tips on how to convert to regular mode,
which is trivial (see commit e474dcb231, CMake 2.8.7).
It's time to consider this feature deprecated and issue a warning at
configuration time as well.
This adds a configuration time deprecation `AUTHOR_WARNING` for
`CMAKE_AUTOMOC_RELAXED_MODE`.
diff --git a/Source/cmQtAutoGenInitializer.cxx
b/Source/cmQtAutoGenInitializer.cxx
index 2d12964..265daf6 100644
--- a/Source/cmQtAutoGenInitializer.cxx
+++ b/Source/cmQtAutoGenInitializer.cxx
@@ -407,6 +407,19 @@ bool cmQtAutoGenInitializer::InitCustomTargets()
}
}
}
+
+ // CMAKE_AUTOMOC_RELAXED_MODE deprecation warning
+ if (this->Moc.Enabled) {
+ if (cmSystemTools::IsOn(
+ makefile->GetDefinition("CMAKE_AUTOMOC_RELAXED_MODE"))) {
+ std::string msg = "AUTOMOC: CMAKE_AUTOMOC_RELAXED_MODE is "
+ "deprecated an will be removed in the future. ";
+ msg += "Consider disabling it and converting the target ";
+ msg += this->Target->GetName();
+ msg += " to regular mode.";
+ makefile->IssueMessage(MessageType::AUTHOR_WARNING, msg);
+ }
+ }
}
// Init rcc specific settings
diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx
index dbabba0..889f47d 100644
--- a/Source/cmQtAutoMocUic.cxx
+++ b/Source/cmQtAutoMocUic.cxx
@@ -708,7 +708,7 @@ bool cmQtAutoMocUic::JobEvaluateT::MocEvalSource(
msg += Quoted(sourceFile.FileName);
msg += "!\nBetter include ";
msg += Quoted(sourceBase + ".moc");
- msg += " for compatibility with strict mode.\n";
+ msg += " for compatibility with regular mode.\n";
msg += "This is a CMAKE_AUTOMOC_RELAXED_MODE warning.\n";
Log().WarningFile(GenT::MOC, sourceFile.FileName, msg);
}
@@ -770,7 +770,7 @@ bool cmQtAutoMocUic::JobEvaluateT::MocEvalSource(
msg += Quoted(header->FileName);
msg += "!\nBetter include ";
msg += Quoted("moc_" + incKey.Base + ".cpp");
- msg += " for a compatibility with strict mode.\n";
+ msg += " for a compatibility with regular mode.\n";
msg += "This is a CMAKE_AUTOMOC_RELAXED_MODE warning.\n";
Log().WarningFile(GenT::MOC, sourceFile.FileName, msg);
} else {
@@ -782,7 +782,7 @@ bool cmQtAutoMocUic::JobEvaluateT::MocEvalSource(
msg += Quoted(header->FileName);
msg += "!\nBetter include ";
msg += Quoted("moc_" + incKey.Base + ".cpp");
- msg += " for compatibility with strict mode.\n";
+ msg += " for compatibility with regular mode.\n";
msg += "This is a CMAKE_AUTOMOC_RELAXED_MODE warning.\n";
Log().WarningFile(GenT::MOC, sourceFile.FileName, msg);
}
@@ -797,7 +797,7 @@ bool cmQtAutoMocUic::JobEvaluateT::MocEvalSource(
// Check if this is the sources own .moc file
bool const ownMoc = (incKey.Base == sourceBase);
if (!ownMoc) {
- // Don't allow <BASE>.moc include other than own in strict mode
+ // Don't allow <BASE>.moc include other than own in regular mode
std::string msg = "The file includes the moc file ";
msg += Quoted(incKey.Key);
msg += ",\nwhich seems to be the moc file from a different "
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62d6ed79fb4cc4cdeb1a246f0f12db7e6031f4ba
commit 62d6ed79fb4cc4cdeb1a246f0f12db7e6031f4ba
Author: Marc Chevrier <marc.chevr...@gmail.com>
AuthorDate: Fri May 24 18:44:43 2019 +0200
Commit: Marc Chevrier <marc.chevr...@gmail.com>
CommitDate: Fri May 24 18:44:43 2019 +0200
FindPython: Add variable 'Python_FIND_FRAMEWORK' to control frameworks
lookup.
diff --git a/Help/release/dev/FindPython-FIND_FRAMEWORK.rst
b/Help/release/dev/FindPython-FIND_FRAMEWORK.rst
new file mode 100644
index 0000000..f390460
--- /dev/null
+++ b/Help/release/dev/FindPython-FIND_FRAMEWORK.rst
@@ -0,0 +1,5 @@
+FindPython-FIND_FRAMEWORK
+-------------------------
+
+* Modules :module:`FindPython3`, :module:`FindPython2` and :module:`FindPython`
+ gain a new variable to control frameworks lookup on macOS.
diff --git a/Modules/FindPython.cmake b/Modules/FindPython.cmake
index 59c286d..e2f3bf3 100644
--- a/Modules/FindPython.cmake
+++ b/Modules/FindPython.cmake
@@ -161,14 +161,19 @@ Hints
* ``LAST``: Try to use registry after environment variables.
* ``NEVER``: Never try to use registry.
-``CMAKE_FIND_FRAMEWORK``
- On macOS the :variable:`CMAKE_FIND_FRAMEWORK` variable determine the order of
+``Python_FIND_FRAMEWORK``
+ On macOS the ``Python_FIND_FRAMEWORK`` variable determine the order of
preference between Apple-style and unix-style package components.
+ This variable can be set to empty or take same values as
+ :variable:`CMAKE_FIND_FRAMEWORK` variable.
.. note::
Value ``ONLY`` is not supported so ``FIRST`` will be used instead.
+ If ``Python_FIND_FRAMEWORK`` is not defined, :variable:`CMAKE_FIND_FRAMEWORK`
+ variable will be used, if any.
+
``Python_FIND_VIRTUALENV``
This variable defines the handling of virtual environments. It is meaningfull
only when a virtual environment is active (i.e. the ``activate`` script has
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
index bb2f60d..83fd1c5 100644
--- a/Modules/FindPython/Support.cmake
+++ b/Modules/FindPython/Support.cmake
@@ -361,6 +361,24 @@ set (_${_PYTHON_PREFIX}_IRON_PYTHON_PATH_SUFFIXES net45
net40)
# Apple frameworks handling
_python_find_frameworks ()
+set (_${_PYTHON_PREFIX}_FIND_FRAMEWORK "FIRST")
+
+if (DEFINED ${_PYTHON_PREFIX}_FIND_FRAMEWORK)
+ if (NOT ${_PYTHON_PREFIX}_FIND_FRAMEWORK MATCHES "^(FIRST|LAST|NEVER)$")
+ message (AUTHOR_WARNING "Find${_PYTHON_PREFIX}:
${${_PYTHON_PREFIX}_FIND_FRAMEWORK}: invalid value for
'${_PYTHON_PREFIX}_FIND_FRAMEWORK'. 'FIRST', 'LAST' or 'NEVER' expected.
'FIRST' will be used instead.")
+ else()
+ set (_${_PYTHON_PREFIX}_FIND_FRAMEWORK ${${_PYTHON_PREFIX}_FIND_FRAMEWORK})
+ endif()
+elseif (DEFINED CMAKE_FIND_FRAMEWORK)
+ if (CMAKE_FIND_FRAMEWORK STREQUAL "ONLY")
+ message (AUTHOR_WARNING "Find${_PYTHON_PREFIX}: CMAKE_FIND_FRAMEWORK:
'ONLY' value is not supported. 'FIRST' will be used instead.")
+ elseif (NOT CMAKE_FIND_FRAMEWORK MATCHES "^(FIRST|LAST|NEVER)$")
+ message (AUTHOR_WARNING "Find${_PYTHON_PREFIX}: ${CMAKE_FIND_FRAMEWORK}:
invalid value for 'CMAKE_FIND_FRAMEWORK'. 'FIRST', 'LAST' or 'NEVER' expected.
'FIRST' will be used instead.")
+ else()
+ set (_${_PYTHON_PREFIX}_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK})
+ endif()
+endif()
+
# Save CMAKE_FIND_APPBUNDLE
if (DEFINED CMAKE_FIND_APPBUNDLE)
set (_${_PYTHON_PREFIX}_CMAKE_FIND_APPBUNDLE ${CMAKE_FIND_APPBUNDLE})
@@ -373,15 +391,8 @@ set (CMAKE_FIND_APPBUNDLE "NEVER")
# Save CMAKE_FIND_FRAMEWORK
if (DEFINED CMAKE_FIND_FRAMEWORK)
set (_${_PYTHON_PREFIX}_CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK})
- if (CMAKE_FIND_FRAMEWORK STREQUAL "ONLY")
- message (AUTHOR_WARNING "Find${_PYTHON_PREFIX}: CMAKE_FIND_FRAMEWORK:
'ONLY' value is not supported. 'FIRST' will be used instead.")
- set (_${_PYTHON_PREFIX}_FIND_FRAMEWORK "FIRST")
- else()
- set (_${_PYTHON_PREFIX}_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK})
- endif()
else()
unset (_${_PYTHON_PREFIX}_CMAKE_FIND_FRAMEWORK)
- set (_${_PYTHON_PREFIX}_FIND_FRAMEWORK "FIRST")
endif()
# To avoid framework lookup
set (CMAKE_FIND_FRAMEWORK "NEVER")
@@ -389,7 +400,7 @@ set (CMAKE_FIND_FRAMEWORK "NEVER")
# Windows Registry handling
if (DEFINED ${_PYTHON_PREFIX}_FIND_REGISTRY)
if (NOT ${_PYTHON_PREFIX}_FIND_REGISTRY MATCHES "^(FIRST|LAST|NEVER)$")
- message (AUTHOR_WARNING "Find${_PYTHON_PREFIX}:
${${_PYTHON_PREFIX}_FIND_REGISTRY}: invalid value for
'${_PYTHON_PREFIX}_FIND_REGISTRY'. 'FIRST', 'LAST' or 'NEVER' expected.")
+ message (AUTHOR_WARNING "Find${_PYTHON_PREFIX}:
${${_PYTHON_PREFIX}_FIND_REGISTRY}: invalid value for
'${_PYTHON_PREFIX}_FIND_REGISTRY'. 'FIRST', 'LAST' or 'NEVER' expected. 'FIRST'
will be used instead.")
set (_${_PYTHON_PREFIX}_FIND_REGISTRY "FIRST")
else()
set (_${_PYTHON_PREFIX}_FIND_REGISTRY ${${_PYTHON_PREFIX}_FIND_REGISTRY})
@@ -402,7 +413,7 @@ endif()
if (DEFINED ENV{VIRTUAL_ENV})
if (DEFINED ${_PYTHON_PREFIX}_FIND_VIRTUALENV)
if (NOT ${_PYTHON_PREFIX}_FIND_VIRTUALENV MATCHES
"^(FIRST|ONLY|STANDARD)$")
- message (AUTHOR_WARNING "Find${_PYTHON_PREFIX}:
${${_PYTHON_PREFIX}_FIND_VIRTUALENV}: invalid value for
'${_PYTHON_PREFIX}_FIND_VIRTUALENV'. 'FIRST', 'ONLY' or 'IGNORE' expected.")
+ message (AUTHOR_WARNING "Find${_PYTHON_PREFIX}:
${${_PYTHON_PREFIX}_FIND_VIRTUALENV}: invalid value for
'${_PYTHON_PREFIX}_FIND_VIRTUALENV'. 'FIRST', 'ONLY' or 'STANDARD' expected.
'FIRST' will be used instead.")
set (_${_PYTHON_PREFIX}_FIND_VIRTUALENV "FIRST")
else()
set (_${_PYTHON_PREFIX}_FIND_VIRTUALENV
${${_PYTHON_PREFIX}_FIND_VIRTUALENV})
diff --git a/Modules/FindPython2.cmake b/Modules/FindPython2.cmake
index 8a633e0..8372ce7 100644
--- a/Modules/FindPython2.cmake
+++ b/Modules/FindPython2.cmake
@@ -162,14 +162,19 @@ Hints
* ``LAST``: Try to use registry after environment variables.
* ``NEVER``: Never try to use registry.
-``CMAKE_FIND_FRAMEWORK``
- On macOS the :variable:`CMAKE_FIND_FRAMEWORK` variable determine the order of
+``Python2_FIND_FRAMEWORK``
+ On macOS the ``Python2_FIND_FRAMEWORK`` variable determine the order of
preference between Apple-style and unix-style package components.
+ This variable can be set to empty or take same values as
+ :variable:`CMAKE_FIND_FRAMEWORK` variable.
.. note::
Value ``ONLY`` is not supported so ``FIRST`` will be used instead.
+ If ``Python2_FIND_FRAMEWORK`` is not defined,
:variable:`CMAKE_FIND_FRAMEWORK`
+ variable will be used, if any.
+
``Python2_FIND_VIRTUALENV``
This variable defines the handling of virtual environments. It is meaningfull
only when a virtual environment is active (i.e. the ``activate`` script has
diff --git a/Modules/FindPython3.cmake b/Modules/FindPython3.cmake
index 2867326..2ead5b6 100644
--- a/Modules/FindPython3.cmake
+++ b/Modules/FindPython3.cmake
@@ -162,14 +162,19 @@ Hints
* ``LAST``: Try to use registry after environment variables.
* ``NEVER``: Never try to use registry.
-``CMAKE_FIND_FRAMEWORK``
- On macOS the :variable:`CMAKE_FIND_FRAMEWORK` variable determine the order of
+``Python3_FIND_FRAMEWORK``
+ On macOS the ``Python3_FIND_FRAMEWORK`` variable determine the order of
preference between Apple-style and unix-style package components.
+ This variable can be set to empty or take same values as
+ :variable:`CMAKE_FIND_FRAMEWORK` variable.
.. note::
Value ``ONLY`` is not supported so ``FIRST`` will be used instead.
+ If ``Python3_FIND_FRAMEWORK`` is not defined,
:variable:`CMAKE_FIND_FRAMEWORK`
+ variable will be used, if any.
+
``Python3_FIND_VIRTUALENV``
This variable defines the handling of virtual environments. It is meaningfull
only when a virtual environment is active (i.e. the ``activate`` script has
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/FindPython-FIND_FRAMEWORK.rst | 5 +++++
Help/release/dev/cmake_automoc_relaxed_mode.rst | 5 +++++
Help/variable/CMAKE_AUTOMOC_RELAXED_MODE.rst | 2 ++
Modules/FindPython.cmake | 9 ++++++--
Modules/FindPython/Support.cmake | 29 +++++++++++++++++--------
Modules/FindPython2.cmake | 9 ++++++--
Modules/FindPython3.cmake | 9 ++++++--
Modules/FindThreads.cmake | 3 ---
Source/cmQtAutoGenInitializer.cxx | 13 +++++++++++
Source/cmQtAutoMocUic.cxx | 8 +++----
10 files changed, 70 insertions(+), 22 deletions(-)
create mode 100644 Help/release/dev/FindPython-FIND_FRAMEWORK.rst
create mode 100644 Help/release/dev/cmake_automoc_relaxed_mode.rst
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
