[Cmake-commits] CMake branch, master, updated. v3.13.0-rc3-426-g06ef9ed
Kitware Robot
kwrobot at kitware.com
Tue Nov 13 10:43:16 EST 2018
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 06ef9edd51a8ffbd77fb96f733cbe45af84e9559 (commit)
via bd04db899f51b93581107ef35fc970b4fd54c410 (commit)
via 4fd97bbc2cfb91a29fd25d35e12c5784f2637aee (commit)
via 9bb203ed0f983305462a9d42ce9c906a292d42c1 (commit)
via ad6ef6c1d5ba1434215bf9e891c87f71514446e9 (commit)
via 5045cd82d03c7cba5f9bd1a128996de289196b92 (commit)
via 247266aa3f1483c55e3169f02f10db59b87027f1 (commit)
via 0470ee96b1268d5565905581fc137ea33cd0c906 (commit)
via 3a7f02197bb71553d47f24130fda1add30dbcb27 (commit)
via 516c6fc38c0bdfd7905edb169a4ebfef689cf116 (commit)
from d3b932fa678516d3f5bb7f7209547a876a182d02 (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=06ef9edd51a8ffbd77fb96f733cbe45af84e9559
commit 06ef9edd51a8ffbd77fb96f733cbe45af84e9559
Merge: bd04db8 3a7f021
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 13 15:40:52 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Nov 13 10:41:20 2018 -0500
Merge topic 'DeployQt4'
3a7f02197b Help: Downcase function names in DeployQt4 doc.
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2600
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd04db899f51b93581107ef35fc970b4fd54c410
commit bd04db899f51b93581107ef35fc970b4fd54c410
Merge: 4fd97bb 0470ee9
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 13 15:40:31 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Nov 13 10:40:38 2018 -0500
Merge topic 'WriteCompilerDetectionHeader'
0470ee96b1 Help: Remove duplication of function name.
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2605
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4fd97bbc2cfb91a29fd25d35e12c5784f2637aee
commit 4fd97bbc2cfb91a29fd25d35e12c5784f2637aee
Merge: 9bb203e ad6ef6c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 13 10:39:12 2018 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 13 10:39:12 2018 -0500
Merge branch 'release-3.13'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9bb203ed0f983305462a9d42ce9c906a292d42c1
commit 9bb203ed0f983305462a9d42ce9c906a292d42c1
Merge: 247266a 5045cd8
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 13 15:38:43 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Nov 13 10:38:54 2018 -0500
Merge topic 'FindBoost-1.69'
5045cd82d0 FindBoost: Additional fixes for 1.69
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2601
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=247266aa3f1483c55e3169f02f10db59b87027f1
commit 247266aa3f1483c55e3169f02f10db59b87027f1
Merge: d3b932f 516c6fc
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 13 15:32:10 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Nov 13 10:33:05 2018 -0500
Merge topic 'vs-just-my-code-flag-map'
516c6fc38c VS: Add flag table entry for -JMC
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2587
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0470ee96b1268d5565905581fc137ea33cd0c906
commit 0470ee96b1268d5565905581fc137ea33cd0c906
Author: Joachim Wuttke (l) <j.wuttke at fz-juelich.de>
AuthorDate: Mon Nov 12 22:33:11 2018 +0100
Commit: Joachim Wuttke (l) <j.wuttke at fz-juelich.de>
CommitDate: Mon Nov 12 22:33:11 2018 +0100
Help: Remove duplication of function name.
diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake
index a556567..21ccd7c 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -7,9 +7,8 @@ WriteCompilerDetectionHeader
This module provides the function write_compiler_detection_header().
-The ``WRITE_COMPILER_DETECTION_HEADER`` function can be used to generate
-a file suitable for preprocessor inclusion which contains macros to be
-used in source code::
+This function can be used to generate a file suitable for preprocessor
+inclusion which contains macros to be used in source code::
write_compiler_detection_header(
FILE <file>
@@ -25,8 +24,8 @@ used in source code::
[ALLOW_UNKNOWN_COMPILER_VERSIONS]
)
-The ``write_compiler_detection_header`` function generates the
-file ``<file>`` with macros which all have the prefix ``<prefix>``.
+This generates the file ``<file>`` with macros which all have the prefix
+``<prefix>``.
By default, all content is written directly to the ``<file>``. The
``OUTPUT_FILES_VAR`` may be specified to cause the compiler-specific
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a7f02197bb71553d47f24130fda1add30dbcb27
commit 3a7f02197bb71553d47f24130fda1add30dbcb27
Author: Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
AuthorDate: Mon Nov 12 16:13:57 2018 +0100
Commit: Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
CommitDate: Mon Nov 12 19:51:43 2018 +0100
Help: Downcase function names in DeployQt4 doc.
diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake
index c69cd38..4a18927 100644
--- a/Modules/DeployQt4.cmake
+++ b/Modules/DeployQt4.cmake
@@ -26,13 +26,13 @@ PARENT_SCOPE. Also depends on BundleUtilities.cmake.
::
- WRITE_QT4_CONF(<qt_conf_dir> <qt_conf_contents>)
+ write_qt4_conf(<qt_conf_dir> <qt_conf_contents>)
Writes a qt.conf file with the <qt_conf_contents> into <qt_conf_dir>.
::
- RESOLVE_QT4_PATHS(<paths_var> [<executable_path>])
+ resolve_qt4_paths(<paths_var> [<executable_path>])
Loop through <paths_var> list and if any don't exist resolve them
relative to the <executable_path> (if supplied) or the
@@ -40,7 +40,7 @@ CMAKE_INSTALL_PREFIX.
::
- FIXUP_QT4_EXECUTABLE(<executable>
+ fixup_qt4_executable(<executable>
[<qtplugins> <libs> <dirs> <plugins_dir> <request_qt_conf>])
Copies Qt plugins, writes a Qt configuration file (if needed) and
@@ -67,7 +67,7 @@ needed.
::
- INSTALL_QT4_PLUGIN_PATH(plugin executable copy installed_plugin_path_var
+ install_qt4_plugin_path(plugin executable copy installed_plugin_path_var
<plugins_dir> <component> <configurations>)
Install (or copy) a resolved <plugin> to the default plugins directory
@@ -82,7 +82,7 @@ If <component> is set then anything installed will use this COMPONENT.
::
- INSTALL_QT4_PLUGIN(plugin executable copy installed_plugin_path_var
+ install_qt4_plugin(plugin executable copy installed_plugin_path_var
<plugins_dir> <component>)
Install (or copy) an unresolved <plugin> to the default plugins
@@ -92,7 +92,7 @@ INSTALL_QT4_PLUGIN_PATH.
::
- INSTALL_QT4_EXECUTABLE(<executable>
+ install_qt4_executable(<executable>
[<qtplugins> <libs> <dirs> <plugins_dir> <request_qt_conf> <component>])
Installs Qt plugins, writes a Qt configuration file (if needed) and
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=516c6fc38c0bdfd7905edb169a4ebfef689cf116
commit 516c6fc38c0bdfd7905edb169a4ebfef689cf116
Author: Tengiz Sharafiev <btolfa at gmail.com>
AuthorDate: Sat Nov 10 10:59:29 2018 +0800
Commit: Tengiz Sharafiev <btolfa at gmail.com>
CommitDate: Sat Nov 10 11:06:37 2018 +0800
VS: Add flag table entry for -JMC
Add support for mapping Just My Code compiler flag
Fixes: #18289
diff --git a/Source/cmVS141CLFlagTable.h b/Source/cmVS141CLFlagTable.h
index 2a9944a..7d219be 100644
--- a/Source/cmVS141CLFlagTable.h
+++ b/Source/cmVS141CLFlagTable.h
@@ -194,6 +194,8 @@ static cmVS7FlagTable cmVS141CLFlagTable[] = {
{ "EnablePREfast", "analyze", "", "true", 0 },
{ "UseFullPaths", "FC", "", "true", 0 },
{ "OmitDefaultLibName", "Zl", "", "true", 0 },
+ { "SupportJustMyCode", "JMC-", "", "false", 0 },
+ { "SupportJustMyCode", "JMC", "", "true", 0 },
// Bool Properties With Argument
{ "MultiProcessorCompilation", "MP", "", "true",
-----------------------------------------------------------------------
Summary of changes:
Modules/DeployQt4.cmake | 12 ++++++------
Modules/FindBoost.cmake | 6 +++---
Modules/WriteCompilerDetectionHeader.cmake | 9 ++++-----
Source/cmVS141CLFlagTable.h | 2 ++
Utilities/Scripts/BoostScanDeps.cmake | 4 ++--
5 files changed, 17 insertions(+), 16 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list